|
From: Heiko Z. <smi...@us...> - 2007-03-23 22:36:32
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3218/scripts Modified Files: autoconf automake bison glibc libtool makedepend nasm p7zip Removed Files: gcc Log Message: more fixes Index: bison =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bison,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- bison 11 Jan 2004 14:43:04 -0000 1.6 +++ bison 23 Mar 2007 22:36:28 -0000 1.7 @@ -12,7 +12,7 @@ ### BEGIN INIT INFO # Provides: bison -# Required-Start: prepare distcc gcc libtool prepare +# Required-Start: prepare distcc gcc-4 libtool prepare # Required-Stop: # Default-Start: 1 # Default-Stop: --- gcc DELETED --- Index: makedepend =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/makedepend,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- makedepend 11 Jan 2004 14:43:04 -0000 1.3 +++ makedepend 23 Mar 2007 22:36:28 -0000 1.4 @@ -9,7 +9,7 @@ ### BEGIN INIT INFO # Provides: makedepend -# Required-Start: prepare distcc gcc libtool +# Required-Start: prepare distcc gcc-4 libtool # Required-Stop: # Default-Start: 1 # Default-Stop: Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- glibc 20 Mar 2007 02:41:45 -0000 1.50 +++ glibc 23 Mar 2007 22:36:28 -0000 1.51 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: glibc -# Required-Start: prepare distcc binutils gcc +# Required-Start: prepare distcc binutils gcc-4 # Required-Stop: # Default-Start: 1 2 # Default-Stop: Index: automake =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/automake,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- automake 11 Jan 2004 14:43:04 -0000 1.2 +++ automake 23 Mar 2007 22:36:28 -0000 1.3 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: automake -# Required-Start: gcc libtool binutils autoconf +# Required-Start: gcc-4 libtool binutils autoconf # Required-Stop: # Default-Start: 1 # Default-Stop: Index: libtool =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/libtool,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- libtool 27 Sep 2005 18:44:49 -0000 1.7 +++ libtool 23 Mar 2007 22:36:28 -0000 1.8 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: libtool -# Required-Start: prepare distcc gcc glibc +# Required-Start: prepare distcc gcc-4 glibc # Required-Stop: # Default-Start: 1 # Default-Stop: Index: p7zip =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/p7zip,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- p7zip 20 Mar 2007 02:41:45 -0000 1.6 +++ p7zip 23 Mar 2007 22:36:28 -0000 1.7 @@ -30,9 +30,15 @@ bzcat $SRCDIR/p7zip_*-libun7zip.patch.bz2 | patch -p1 || exit 1 touch .dl_patches_done fi + #cp makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine || exit 1 + #cp makefile.linux_x86_ppc_alpha makefile.machine || exit 1 + pushd 7zip/Bundles/Un7Zip > /dev/null || exit 1 + + #make CXX=/opt/gcc-3.x/bin/g++ $PMAKE || exit 1 make $PMAKE || exit 1 -# We should install libs immediately + + # We should install libs immediately install -s -D -m 755 libun7zip.so /usr/lib/libun7zip.so || exit 1 install -D -m 644 u7zip.h /usr/include/u7zip.h || exit 1 popd > /dev/null || exit 1 Index: autoconf =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/autoconf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- autoconf 11 Jan 2004 14:43:04 -0000 1.2 +++ autoconf 23 Mar 2007 22:36:28 -0000 1.3 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: autoconf -# Required-Start: gcc libtool binutils +# Required-Start: gcc-4 libtool binutils # Required-Stop: # Default-Start: 1 # Default-Stop: Index: nasm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nasm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- nasm 11 Jan 2004 14:43:04 -0000 1.10 +++ nasm 23 Mar 2007 22:36:28 -0000 1.11 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: nasm -# Required-Start: gcc binutils libtool +# Required-Start: gcc-4 binutils libtool # Required-Stop: # Default-Start: 1 # Default-Stop: |