Menu
▾
▴
[Devil-linux-commit] build/scripts dnsmasq,1.1,1.2 eagle-usb,1.3,1.4 frox,1.2,1.3 gpm,1.4,1.5 hostap-driver,1.5,1.6 hostap-utils,1.2,1.3 l2tpd,1.2,1.3 mpeg_encode,1.1,1.2 nbd,1.1,1.2 openh323,1.9,1.10 openssl,1.21,1.22 portmap,1.3,1.4 pwlib,1.12,1.13 rrdtool,1.3,1.4 shfs,1.1,1.2 webalizer,1.2,1.3
|
From: Heiko Z. <smi...@us...> - 2004-08-21 19:18:02
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5089/scripts Modified Files: dnsmasq eagle-usb frox gpm hostap-driver hostap-utils l2tpd mpeg_encode nbd openh323 openssl portmap pwlib rrdtool shfs webalizer Log Message: a couple software updates and changes to get better support for SMP build systems Index: frox =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/frox,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- frox 20 Mar 2004 20:19:55 -0000 1.2 +++ frox 21 Aug 2004 19:17:46 -0000 1.3 @@ -33,7 +33,7 @@ --enable-virus-scan --enable-transparent-data \ --enable-libiptc --enable-ccp --disable-run-as-root \ --enable-configfile=/etc/frox || exit 1 - make all || exit 1 + make $PMAKE all || exit 1 strip_debug fi ;; Index: rrdtool =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/rrdtool,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rrdtool 6 Feb 2004 01:23:40 -0000 1.3 +++ rrdtool 21 Aug 2004 19:17:46 -0000 1.4 @@ -27,7 +27,7 @@ build ) if [ "$CONFIG_RRDTOOL" = "y" ]; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-shared || exit 1 - make all || exit 1 + make $PMAKE all || exit 1 strip_debug # we need that probably for some other tools, so let's install it make install || exit 1 Index: hostap-driver =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/hostap-driver,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- hostap-driver 26 Jun 2004 13:49:04 -0000 1.5 +++ hostap-driver 21 Aug 2004 19:17:46 -0000 1.6 @@ -36,10 +36,10 @@ # disable depmod's , breaking compile on systems with newer kernel sed -i 's%/sbin/depmod -ae%#/sbin/depmod -ae%' Makefile if [ "$CONFIG_PCMCIA_CS" = "y" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then - make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \ + make $PMAKE pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \ -e KERNEL_PATH=$KERNELDIR PCMCIA_PATH=$PCMCIADIR || exit 1 else - make pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \ + make $PMAKE pci plx pccard EXTRA_CFLAG="-DPRISM2_HOSTAPD -DCONFIG_HOSTAP_FIRMWARE" \ -e KERNEL_PATH=$KERNELDIR || exit 1 fi strip_debug Index: pwlib =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pwlib 16 Jan 2004 19:22:48 -0000 1.12 +++ pwlib 21 Aug 2004 19:17:46 -0000 1.13 @@ -35,7 +35,8 @@ test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes ./configure --prefix=/usr || exit 1 # parallel builds fails ($PMAKE) - make || exit 1 + make bothdepend || exit 1 + make $PMAKE || exit 1 strip_debug make install || exit 1 mkdir -p $CDDIR/usr/bin Index: shfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shfs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- shfs 21 Mar 2004 17:20:30 -0000 1.1 +++ shfs 21 Aug 2004 19:17:46 -0000 1.2 @@ -32,7 +32,7 @@ case $1 in build ) if [ "$CONFIG_SHFS" = "y" ]; then - make ROOT=${CDDIR} KERNEL_SOURCES=${KERNELDIR} MAN_PAGE_DIR=/usr/share/man + make $PMAKE ROOT=${CDDIR} KERNEL_SOURCES=${KERNELDIR} MAN_PAGE_DIR=/usr/share/man fi ;; Index: hostap-utils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/hostap-utils,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- hostap-utils 11 Jan 2004 14:43:04 -0000 1.2 +++ hostap-utils 21 Aug 2004 19:17:46 -0000 1.3 @@ -32,7 +32,7 @@ case $1 in build ) if [ "$CONFIG_HOSTAP_UTILS" = "y" ]; then - make || exit 1 + make $PMAKE || exit 1 strip_debug fi ;; Index: openssl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openssl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- openssl 11 Jan 2004 14:43:04 -0000 1.21 +++ openssl 21 Aug 2004 19:17:46 -0000 1.22 @@ -31,7 +31,7 @@ make depend || exit 1 # openssl 0.9.7 doesn't like the parallel builds :-(( - make all || exit 1 + make $PMAKE all || exit 1 strip_debug # we have to install this immediately, because this is a library and could be needed by other sources Index: portmap =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/portmap,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- portmap 11 Jan 2004 14:43:05 -0000 1.3 +++ portmap 21 Aug 2004 19:17:46 -0000 1.4 @@ -33,7 +33,7 @@ zcat $DL_DIR/src/portmap_5-2.diff.gz | patch || exit 1 touch .patch.done fi - make all || exit 1 + make $PMAKE all || exit 1 strip_debug fi ;; Index: webalizer =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/webalizer,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webalizer 27 Jan 2004 20:01:49 -0000 1.2 +++ webalizer 21 Aug 2004 19:17:46 -0000 1.3 @@ -27,7 +27,7 @@ build ) if [ "$CONFIG_WEBALIZER" = "y" ]; then ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-dns || exit 1 - make all || exit 1 + make $PMAKE all || exit 1 strip_debug fi ;; Index: dnsmasq =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dnsmasq,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- dnsmasq 22 Apr 2004 15:11:01 -0000 1.1 +++ dnsmasq 21 Aug 2004 19:17:46 -0000 1.2 @@ -28,7 +28,7 @@ case $1 in build ) if [ "$CONFIG_DNSMASQ" = "y" ]; then - make all PREFIX=/usr || exit 1 + make $PMAKE all PREFIX=/usr || exit 1 strip_debug fi ;; Index: l2tpd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/l2tpd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- l2tpd 11 Jan 2004 14:43:04 -0000 1.2 +++ l2tpd 21 Aug 2004 19:17:46 -0000 1.3 @@ -40,7 +40,7 @@ done fi - make || exit 1 + make $PMAKE || exit 1 strip_debug fi ;; Index: eagle-usb =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/eagle-usb,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- eagle-usb 16 Jun 2004 01:49:21 -0000 1.3 +++ eagle-usb 21 Aug 2004 19:17:46 -0000 1.4 @@ -32,7 +32,7 @@ if [ "$CONFIG_EAGLE_USB" = "y" ]; then ./autogen.sh || exit 1 ./configure --prefix=/usr --with-kernel-src=$KERNELDIR --with-lang=en || exit 1 - make || exit 1 + make $PMAKE || exit 1 fi ;; Index: openh323 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openh323,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- openh323 1 Feb 2004 15:04:23 -0000 1.9 +++ openh323 21 Aug 2004 19:17:46 -0000 1.10 @@ -38,7 +38,9 @@ test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes ./configure --prefix=/usr || exit 1 # don't use parallel builds ($PMAKE) - make || exit 1 + make bothdepend || exit 1 + make $PMAKE || exit 1 + #make || exit 1 strip_debug make install || exit 1 fi Index: nbd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nbd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nbd 1 Mar 2004 00:30:25 -0000 1.1 +++ nbd 21 Aug 2004 19:17:46 -0000 1.2 @@ -31,7 +31,8 @@ SMP=0 test "$CONFIG_LINUX_SMP" = "y" && SMP=1 - make config all $PMAKE PREFIX=/usr prefix=/usr SMP=$SMP BUILD=$(pwd)/build || exit 1 + # doesn't like paralle builds + make config all PREFIX=/usr prefix=/usr SMP=$SMP BUILD=$(pwd)/build || exit 1 strip_debug fi Index: gpm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gpm,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gpm 26 Jun 2004 13:36:55 -0000 1.4 +++ gpm 21 Aug 2004 19:17:46 -0000 1.5 @@ -31,6 +31,7 @@ # correct doc/Makefile.in in case makeinfo is missing, bug in gpm-1.20.1 sed -i s/.'"$(MAKEINFO)" != "no"'/' "$(MAKEINFO)" != "no --no-split"'/ doc/Makefile.in ./configure --prefix=/usr --sysconfdir=/etc || exit 1 + # parallel build doesn't work make all || exit 1 strip_debug fi Index: mpeg_encode =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mpeg_encode,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mpeg_encode 1 Aug 2004 13:29:31 -0000 1.1 +++ mpeg_encode 21 Aug 2004 19:17:46 -0000 1.2 @@ -32,7 +32,7 @@ touch .patch.done fi make clean - make all || exit 1 + make $PMAKE all || exit 1 fi ;; |