Add missing dep of CMake to Graphite. Mv libpsl to main Makefile from QT5.Makefile. Make Valgrind a commented dep. More trouble than it is worth.

5 files changed, 39 insertions, 39 deletions

diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index 4b36d32..2e221d0 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.Makefile
@@ -150,8 +150,8 @@ grantleetheme : grantlee
 gst-plugins-bad : FAAC FAAD2 fdk-aac libass libexif libdvdread libdvdnav \
 	libmpeg2 neon opencv OpenJPEG SoundTouch x265 BlueZ cURL \
 	gst-plugins-base GTK3 LCMS2 libgcrypt libgudev librsvg libsndfile \
-	libssh2 libwebp libxkbcommon Nettle Opus SBC Valgrind Wayland \
-	Xorg-Libs
+	libssh2 libwebp libxkbcommon Nettle Opus SBC Wayland Xorg-Libs \
+	# Valgrind
 	@echo $@
 
 gst-plugins-ugly : liba52 libcdio libdvdread libmpeg2 x264
@@ -172,7 +172,7 @@ Hunspell :
 hyphen :
 	@echo $@
 
-id3lib : alsa-lib FLAC asciidoc Valgrind
+id3lib : alsa-lib FLAC asciidoc # Valgrind
 	@echo $@
 
 ImageMagick : libgxps libraw OpenEXR OpenJPEG
@@ -471,7 +471,7 @@ NetworkManager : dhcp jansson libndp mobile-broadband-provider-info \
 	ModemManager newt UPower \
 	cURL gobject-introspection iptables nss Polkit PyGObject Vala \
 	wpa_supplicant BlueZ DBus-Python GnuTLS GTK-Doc libpsl \
-	qt-everywhere Valgrind
+	qt-everywhere # Valgrind
 	@echo $@
 
 newt : popt slang GPM
@@ -538,7 +538,7 @@ pinentry : libassuan
 	@echo $@
 
 pipewire : BlueZ ffmpeg gstreamer gst-plugins-base libva PulseAudio SBC \
-	SDL2 v4l-utils Valgrind Doxygen Graphviz
+	SDL2 v4l-utils Doxygen Graphviz # Valgrind
 	@echo $@
 
 plasma-wayland-protocols : extra-cmake-modules
@@ -613,7 +613,7 @@ x264 : NASM
 x265 : CMake NASM
 	@echo $@
 
-xapian : Valgrind
+xapian : # Valgrind
 	@echo $@
 
 xine-lib : FAAD2 ImageMagick liba52 libdvdcss libdvdnav libmad Samba ffmpeg-min
diff --git a/blfs/Makefile b/blfs/Makefile
index 02275e8..c510d9d 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -99,10 +99,10 @@ FreeType-HarfBuzz : Brotli FreeType Graphite-HarfBuzz libpng which
 GC : libatomic_ops
 	@echo $@
 
-GDB : Guile six Valgrind-llvm
+GDB : Guile six # Valgrind-llvm
 	@echo $@
 
-git : asciidoc cURL PCRE2 Subversion Tk Valgrind xmlto
+git : asciidoc cURL PCRE2 Subversion Tk xmlto # Valgrind
 	@echo $@
 
 GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
@@ -115,7 +115,7 @@ GnuTLS : libseccomp libidn2 libtasn1 libunistring make-ca Nettle p11-kit
 gobject-introspection : GLib GTK-Doc Mako Markdown
 	@echo $@
 
-Graphite :
+Graphite : CMake
 	@echo $@
 
 Graphviz :
@@ -238,16 +238,19 @@ libpcap : BlueZ libnl libusb
 libpng :
 	@echo $@
 
+libpsl : libidn2 GTK-Doc # Valgrind
+	@echo $@
+
 libpwquality : CrackLib Linux-PAM
 	@echo $@
 
-libseccomp : Valgrind
+libseccomp : # Valgrind
 	@echo $@
 
 libssh2 :
 	@echo $@
 
-libtasn1 : GTK-Doc Valgrind
+libtasn1 : GTK-Doc # Valgrind
 	@echo $@
 
 libtirpc : MIT_Kerberos-keyutils
@@ -293,10 +296,10 @@ qrencode : Doxygen
 lxml : libxslt
 	@echo $@
 
-LVM2 : libaio mdadm reiserfsprogs Valgrind which xfsprogs
+LVM2 : libaio mdadm reiserfsprogs which xfsprogs # Valgrind
 	@echo $@
 
-LLVM : CMake libxml2 Pygments PyYAML Valgrind Zip
+LLVM : CMake libxml2 Pygments PyYAML Zip # Valgrind
 	@echo $@
 
 Lynx : Sharutils Zip unzip
@@ -372,10 +375,10 @@ OpenSSH : libedit
 p11-kit : libtasn1 libxslt nss
 	@echo $@
 
-PCRE : libedit Valgrind
+PCRE : libedit # Valgrind
 	@echo $@
 
-PCRE2 : libedit Valgrind
+PCRE2 : libedit # Valgrind
 	@echo $@
 
 Polkit : GLib gobject-introspection js78 Linux-PAM
@@ -438,7 +441,7 @@ sudo : bind-utils Linux-PAM MIT_Kerberos-keyutils OpenLDAP
 Systemd-Extras : btrfs-progs cURL cryptsetup dbus-xorglibs git GnuTLS iptables \
 	libcap-pam libgcrypt libidn2 libmicrohttpd libpwquality libxkbcommon lxml \
 	lz4 make-ca nftables p11-kit PCRE2 Polkit qrencode rsync shadow-pam \
-	Valgrind zsh # gnu-efi kexec-tools libfido2 quota-tools Sphinx
+	zsh # Valgrind gnu-efi kexec-tools libfido2 quota-tools Sphinx
 	@echo $@
 
 Tk : Xorg-Libs
@@ -468,7 +471,7 @@ Wayland : Doxygen libxml2
 Wayland-Protocols : Wayland
 	@echo $@
 
-wget : make-ca PCRE2
+wget : libidn2 libpsl make-ca PCRE2
 	@echo $@
 
 which :
@@ -507,7 +510,7 @@ yasm :
 Zip :
 	@echo $@
 
-zsh : libcap-pam PCRE Valgrind
+zsh : libcap-pam PCRE # Valgrind
 	@echo $@
 
 
diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index 51df39a..9a0b424 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -75,7 +75,7 @@ DConf : bash-completion GLib GTK3 libxml2 libxslt Vala GTK-Doc # dbus
 fftw :
 	@echo $@
 
-FLAC : libogg NASM DocBook-Utils Doxygen Valgrind
+FLAC : libogg NASM DocBook-Utils Doxygen # Valgrind
 	@echo $@
 
 GConf : dbus-glib libxml2 gobject-introspection GTK3 Polkit OpenLDAP
@@ -100,8 +100,8 @@ graphene :
 	@echo $@
 
 gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \
-	libvorbis Opus SDL2 Valgrind gobject-introspection ISO-Codes \
-	libgudev Mesa Wayland-Protocols Xorg-Libs
+	libvorbis Opus SDL2 gobject-introspection ISO-Codes \
+	libgudev Mesa Wayland-Protocols Xorg-Libs # Valgrind
 	@echo $@
 
 gst-plugins-base-qt : qt-everywhere
@@ -109,14 +109,14 @@ gst-plugins-base-qt : qt-everywhere
 
 gst-plugins-good : AAlib alsa-oss FLAC gst-plugins-base LAME libcaca \
 	libdv libsoup libvpx mpg123 PulseAudio Speex taglib v4l-utils \
-	Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland Valgrind \
-	NASM Xorg-Libs
+	Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland \
+	NASM Xorg-Libs # Valgrind
 	@echo $@
 
 gst-plugins-good-qt : qt-everywhere
 	@echo $@
 
-gstreamer : Gsl GLib gobject-introspection GTK3 Valgrind
+gstreamer : Gsl GLib gobject-introspection GTK3 # Valgrind
 	@echo $@
 
 ibus : DConf libnotify DBus-Python PyGObject PyXDG \
@@ -169,9 +169,6 @@ libogg :
 libpaper :
 	@echo $@
 
-libpsl : libidn2 GTK-Doc Valgrind
-	@echo $@
-
 libsamplerate : alsa-lib libsndfile fftw
 	@echo $@
 
@@ -201,7 +198,7 @@ libtiff-libwebp : libwebp
 	@echo $@
 
 MariaDB : Boost Ruby unixODBC \
-	CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE Valgrind
+	CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE # Valgrind
 	@echo $@
 
 mpg123 : alsa-lib Boost PulseAudio
@@ -218,7 +215,7 @@ PostgreSQL : Python2 ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
 	@echo $@
 
 PulseAudio : libsndfile alsa-lib Speex Avahi fftw GConf libsamplerate SBC \
-	GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 Valgrind # dbus
+	GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 # Valgrind dbus
 	@echo $@
 
 PyCairo : Python2 Cairo
@@ -230,13 +227,13 @@ PyGObject : PyCairo Python2
 PyGTK : libglade PyCairo PyGObject Python2 ATK GTK2 libxslt Pango
 	@echo $@
 
-Python2 : BlueZ Valgrind sqlite3 Tk
+Python2 : BlueZ sqlite3 Tk # Valgrind
 	@echo $@
 
 PyXDG : Python2
 	@echo $@
 
-Ruby : Berkeley_DB Doxygen Graphviz Tk Valgrind
+Ruby : Berkeley_DB Doxygen Graphviz Tk # Valgrind
 	@echo $@
 
 SANE : Avahi v4l-utils
@@ -252,7 +249,7 @@ SDL2 : Alsa ibus PulseAudio libsamplerate \
 slang : libpng PCRE
 	@echo $@
 
-Speex : libogg Valgrind
+Speex : libogg # Valgrind
 	@echo $@
 
 sysprof : libdazzle GTK3 Polkit
diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile
index 2200d59..e3f2add 100644
--- a/blfs/Utils.Makefile
+++ b/blfs/Utils.Makefile
@@ -96,7 +96,7 @@ Ed : libarchive
 Emacs : HarfBuzz giflib GnuTLS jansson libtiff Xorg-Libs \
 	alsa-lib Cairo GConf gobject-introspection gsettings-desktop-schemas \
 	GPM GTK2 GTK3 ImageMagick LCMS2 libjpeg-turbo libpng librsvg libxml2 \
-	MIT_Kerberos Valgrind # dbus
+	MIT_Kerberos # Valgrind dbus
 	@echo $@
 
 Joe :
@@ -122,8 +122,8 @@ libiodbc :
 liblinear :
 	@echo $@
 
-Talloc : docbook-xml docbook-xsl libxslt GDB git libnsl libtirpc Valgrind \
-	xfsprogs
+Talloc : docbook-xml docbook-xsl libxslt GDB git libnsl libtirpc xfsprogs \
+	# Valgrind
 	@echo $@
 
 telepathy-glib : dbus-glib GTK-Doc libxslt gobject-introspection Vala # dbus
diff --git a/blfs/Xorg.Makefile b/blfs/Xorg.Makefile
index 55f28f5..c23f27b 100644
--- a/blfs/Xorg.Makefile
+++ b/blfs/Xorg.Makefile
@@ -17,8 +17,8 @@ at-spi2-core : GLib Xorg-Libs gobject-introspection GTK-Doc # dbus
 ATK : GLib gobject-introspection GTK-Doc
 	@echo $@
 
-Cairo : Pixman libdrm Fontconfig GLib GTK-Doc libpng libxml2 LZO Valgrind \
-	Xorg-Libs
+Cairo : Pixman libdrm Fontconfig GLib GTK-Doc libpng libxml2 LZO \
+	Xorg-Libs # Valgrind
 	@echo $@
 
 Cairo-Extra : Cogl GTK2 GTK3 Poppler QT
@@ -106,7 +106,7 @@ libvdpau : Xorg-Libs Graphviz
 libwacom : libgudev
 	@echo $@
 
-Mesa : libdrm libva libvdpau LLVM libgcrypt Nettle Valgrind
+Mesa : libdrm libva libvdpau LLVM libgcrypt Nettle # Valgrind
 	@echo $@ https://gitlab.freedesktop.org/mesa/mesa.git
 
 mtdev :
@@ -178,5 +178,5 @@ Xorg-Server : libepoxy Pixman-GTK2 xcb-util-keysyms xcb-util-image \
 	Wayland-Protocols Nettle libgcrypt fop
 	@echo $@
 
-xterm : dejavu-fonts Xorg-Apps PCRE2 Valgrind
+xterm : dejavu-fonts Xorg-Apps PCRE2 # Valgrind
 	@echo $@