From: Michael Tremer Date: Tue, 27 Jan 2009 21:20:28 +0000 (+0100) Subject: Added a lot of dependencies... X-Git-Tag: v3.0-alpha1~76^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47815f74b640667f3683f2950224febee44e6feb;p=ipfire-3.x.git Added a lot of dependencies... --- diff --git a/lfs/bind b/lfs/bind index af92e58ac..4233b5b79 100644 --- a/lfs/bind +++ b/lfs/bind @@ -38,7 +38,7 @@ MAINTAINER = GROUP = Networking/Tools EXTRA = no DEBUG = no -DEPS = +DEPS = openssl URL = http://www.isc.org/products/BIND/ LICENSE = Proprietary diff --git a/lfs/binutils b/lfs/binutils index b52dbfbc4..fc41e0ab5 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -42,7 +42,7 @@ MAINTAINER = GROUP = Development/Tools EXTRA = no DEBUG = no -DEPS = +DEPS = zlib URL = http://www.gnu.org/software/binutils/ LICENSE = GPLv2+ diff --git a/lfs/cracklib b/lfs/cracklib index 9cd5d9eff..e1a361023 100644 --- a/lfs/cracklib +++ b/lfs/cracklib @@ -38,7 +38,7 @@ MAINTAINER = GROUP = Security/Password EXTRA = no DEBUG = no -DEPS = +DEPS = python URL = http://sourceforge.net/projects/cracklib/ LICENSE = GPLv2 diff --git a/lfs/curl b/lfs/curl index fc46d4c34..32e7d995d 100644 --- a/lfs/curl +++ b/lfs/curl @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = pkg-config openssl openldap + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl index ec9d3b8c2..6039486d1 100644 --- a/lfs/cyrus-sasl +++ b/lfs/cyrus-sasl @@ -38,7 +38,7 @@ MAINTAINER = GROUP = System/Libraries EXTRA = no DEBUG = no -DEPS = +DEPS = openssl pam URL = http://asg.web.cmu.edu/sasl/sasl-library.html LICENSE = BSD diff --git a/lfs/dbus b/lfs/dbus index a047bbde1..e12feff4c 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -38,7 +38,7 @@ MAINTAINER = GROUP = System/Libraries EXTRA = no DEBUG = no -DEPS = +DEPS = expat URL = http://www.freedesktop.org/software/dbus/ LICENSE = GPLv2+ AFL diff --git a/lfs/dbus-glib b/lfs/dbus-glib index e79f87912..240faa183 100644 --- a/lfs/dbus-glib +++ b/lfs/dbus-glib @@ -38,7 +38,7 @@ MAINTAINER = GROUP = System/Libraries EXTRA = no DEBUG = no -DEPS = +DEPS = dbus glib expat URL = http://www.freedesktop.org/software/dbus/ LICENSE = GPLv2+ AFL diff --git a/lfs/fcron b/lfs/fcron index 47ac7a6e0..057aaac0d 100644 --- a/lfs/fcron +++ b/lfs/fcron @@ -38,7 +38,7 @@ MAINTAINER = GROUP = System/Daemons EXTRA = no DEBUG = no -DEPS = +DEPS = pam vim URL = http://fcron.free.fr/ LICENSE = GPLv2+ diff --git a/lfs/fontconfig b/lfs/fontconfig index 62aa6ee18..39b5398f5 100644 --- a/lfs/fontconfig +++ b/lfs/fontconfig @@ -38,7 +38,7 @@ MAINTAINER = GROUP = System/Libraries EXTRA = no DEBUG = no -DEPS = +DEPS = freetype libxml2 URL = http://fontconfig.org/ LICENSE = MIT diff --git a/lfs/glib b/lfs/glib index 2975c9f0c..09643f0f2 100644 --- a/lfs/glib +++ b/lfs/glib @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = pkg-config + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/gnupg b/lfs/gnupg index d770bf9ed..4b7e8c1f4 100644 --- a/lfs/gnupg +++ b/lfs/gnupg @@ -38,7 +38,7 @@ MAINTAINER = GROUP = Security/Tools EXTRA = no DEBUG = no -DEPS = libassuan libgcrypt libksba pinentry pth +DEPS = curl libassuan libgcrypt libksba pinentry pth URL = http://www.gnupg.org/ LICENSE = GPLv3+ diff --git a/lfs/hal b/lfs/hal index 8613fb851..2bc34aa5b 100644 --- a/lfs/hal +++ b/lfs/hal @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = dbus-glib parted pciutils perl-xml-parser python usbutils + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/libtiff b/lfs/libtiff index aa260ad99..38855bb83 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = tiff-$(VER).tar.gz DIR_APP = $(DIR_SRC)/tiff-$(VER) +DEPS = libjpeg + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/libusb-compat b/lfs/libusb-compat index abbc6c88a..2f8a29ab7 100644 --- a/lfs/libusb-compat +++ b/lfs/libusb-compat @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = libusb + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/libxslt b/lfs/libxslt index b76b5416d..766aabad2 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = libxml2 + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/mc b/lfs/mc index bf4e3dfc7..d73c7c1b9 100644 --- a/lfs/mc +++ b/lfs/mc @@ -29,6 +29,7 @@ VER = 4.6.1 EXTRA = yes DEBUG = no +DEPS = glib slang THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz diff --git a/lfs/nano b/lfs/nano index 5109c4ee5..10e8f3142 100644 --- a/lfs/nano +++ b/lfs/nano @@ -29,6 +29,7 @@ VER = 2.0.7 EXTRA = yes DEBUG = no +DEPS = slang THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz diff --git a/lfs/ntp b/lfs/ntp index 5e65842a3..a1a96fd7e 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = openssl + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/openldap b/lfs/openldap index 9c453bf97..8f19537cc 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tgz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = berkeley cyrus-sasl openssl pth + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) CFLAGS += -D_GNU_SOURCE diff --git a/lfs/openssh b/lfs/openssh index 8231e3f21..dd2ba09d7 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = openssl pam + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) INITSCRIPT = sshd diff --git a/lfs/pam b/lfs/pam index d6e0a49e1..081d4a353 100644 --- a/lfs/pam +++ b/lfs/pam @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = cracklib + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS) ############################################################################### diff --git a/lfs/pam_ldap b/lfs/pam_ldap index 7dfba4759..c4e10b659 100644 --- a/lfs/pam_ldap +++ b/lfs/pam_ldap @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = openldap + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/ppp b/lfs/ppp index b505c6109..551da9d17 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = libpcap linux-atm + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/python-dbus b/lfs/python-dbus index 642e0254b..18273507f 100644 --- a/lfs/python-dbus +++ b/lfs/python-dbus @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = dbus-glib python + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/slang b/lfs/slang index 955bc3faf..f719336c8 100644 --- a/lfs/slang +++ b/lfs/slang @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.bz2 DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = pcre + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/lfs/usbutils b/lfs/usbutils index 78d9f3a29..2e66f9a99 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -31,6 +31,8 @@ THISAPP = $(PKG_NAME)-$(VER) DL_FILE = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(THISAPP) +DEPS = libusb-compat + OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) ############################################################################### diff --git a/make.sh b/make.sh index 567317142..798eaacf0 100755 --- a/make.sh +++ b/make.sh @@ -198,7 +198,7 @@ ipfire_build() { ipfire_make dbus ipfire_make dbus-glib ipfire_make openssl - ipfire_make perl ### We are building the modules here. + ipfire_make perl-xml-parser ipfire_make python ipfire_make python-dbus ipfire_make python-urlgrabber @@ -291,6 +291,7 @@ ipfire_build() { ipfire_make hdparm ipfire_make smartmontools ipfire_make lm-sensors + ipfire_make parted ipfire_make hal ipfire_make hal-info @@ -312,7 +313,6 @@ ipfire_build() { #ipfire_make logwatch ipfire_make cpio ipfire_make cdrtools - ipfire_make parted ipfire_make python-parted ipfire_make memtest86+ #ipfire_make pakfire diff --git a/tools/make-include b/tools/make-include index 4fe184a82..e5a3764dc 100644 --- a/tools/make-include +++ b/tools/make-include @@ -163,6 +163,9 @@ entershell() { ################################################################################ lfsmakecommoncheck() { + logger "Building $*" + build_spy package $1 + # Script present? if [ ! -f $BASEDIR/lfs/$1 ]; then exiterror "No such file or directory: $BASEDIR/lfs/$1" @@ -224,15 +227,12 @@ lfsmakecommoncheck() fi fi - echo -e "$(date -u '+%b %e %T'): Building $* " >> $LOGFILE - cd $BASEDIR/lfs && make -s -f $* MACHINE=$MACHINE LFS_BASEDIR=$BASEDIR MESSAGE="$1\t " download >> $LOGFILE 2>&1 if [ $? -ne 0 ]; then exiterror "Download error in $1" fi - build_spy package $1 - distcc_reload + distcc_reload & return 0 # pass all! } # End of lfsmakecommoncheck()