diff --git a/cross/pkgs/gcc/build.sh b/cross/pkgs/gcc/build.sh index 19a67b0..78730aa 100755 --- a/cross/pkgs/gcc/build.sh +++ b/cross/pkgs/gcc/build.sh @@ -11,7 +11,6 @@ function failOnError { # $1 -> exit status on a previous command # $2 -> task description if [ $1 -ne 0 ]; then - echo "ERROR $2" echo echo BUILD LOG: @@ -23,7 +22,9 @@ function failOnError { date > $WORKING_DIR/gcc.build.log -git clean -xdf src +# verify libtool is installed +libtool --version >> $WORKING_DIR/gcc.build.log +failOnError $? "libtool version" (cd src && fetch) >> $WORKING_DIR/gcc.build.log failOnError $? "fetching sources" @@ -31,26 +32,28 @@ failOnError $? "fetching sources" echo -n Building libgmp... | tee -a $WORKING_DIR/gcc.build.log ( cd src/libgmp && - patch -p0 < $WORKING_DIR/patch/libgmp.patch && + ( grep -q jehanne configfsf.sub || patch -p0 < $WORKING_DIR/patch/libgmp.patch ) && ./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE && make && - make DESTDIR=$JEHANNE/pkgs/libgmp/6.1.2/ install -) >> $WORKING_DIR/gcc.build.log + make DESTDIR=$JEHANNE/pkgs/libgmp/6.1.2/ install && + libtool --mode=finish $JEHANNE/posix/lib +) >> $WORKING_DIR/gcc.build.log 2>&1 failOnError $? "Building libgmp" echo done. -# Copy to /posix (to emulate bind during cross compilation) +#2 Copy to /posix (to emulate bind during cross compilation) cp -pfr $JEHANNE/pkgs/libgmp/6.1.2/posix/* $JEHANNE/posix echo -n Building libmpfr... | tee -a $WORKING_DIR/gcc.build.log ( cd src/libmpfr && - patch -p0 < $WORKING_DIR/patch/libmpfr.patch && + ( grep -q jehanne config.sub || patch -p0 < $WORKING_DIR/patch/libmpfr.patch ) && ./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --with-gmp=$JEHANNE/pkgs/libgmp/6.1.2/posix/ && cp ../../../../patch/MakeNothing.in doc/Makefile && make && - make DESTDIR=$JEHANNE/pkgs/libmpfr/4.0.1/ install -) >> $WORKING_DIR/gcc.build.log + make DESTDIR=$JEHANNE/pkgs/libmpfr/4.0.1/ install && + libtool --mode=finish $JEHANNE/posix/lib +) >> $WORKING_DIR/gcc.build.log 2>&1 failOnError $? "Building libmpfr" echo done. @@ -60,33 +63,34 @@ cp -pfr $JEHANNE/pkgs/libmpfr/4.0.1/posix/* $JEHANNE/posix echo -n Building libmpc... | tee -a $WORKING_DIR/gcc.build.log ( cd src/libmpc && - chmod u+w config.sub && + ( grep -q jehanne config.sub || ( chmod u+w config.sub && patch -p0 < $WORKING_DIR/patch/libmpc.patch && - chmod u-w config.sub && + chmod u-w config.sub ) ) && ./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --with-gmp=$JEHANNE/pkgs/libgmp/6.1.2/posix/ --with-mpfr=$JEHANNE/pkgs/libmpfr/4.0.1/posix/ && cp ../../../../patch/MakeNothing.in doc/Makefile && make && - make DESTDIR=$JEHANNE/pkgs/libmpc/1.1.0/ install -) >> $WORKING_DIR/gcc.build.log + make DESTDIR=$JEHANNE/pkgs/libmpc/1.1.0/ install && + libtool --mode=finish $JEHANNE/posix/lib +) >> $WORKING_DIR/gcc.build.log 2>&1 failOnError $? "Building libmpc" echo done. # Copy to /posix (to emulate bind during cross compilation) cp -pfr $JEHANNE/pkgs/libmpc/1.1.0/posix/* $JEHANNE/posix -echo -n Building binutils... | tee -a $WORKING_DIR/gcc.build.log -( - cd src/libmpc && - chmod u+w config.sub && - patch -p0 < $WORKING_DIR/patch/libmpc.patch && - chmod u-w config.sub && - ./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --with-gmp=$JEHANNE/pkgs/libgmp/6.1.2/posix/ --with-mpfr=$JEHANNE/pkgs/libmpfr/4.0.1/posix/ && - cp ../../../../patch/MakeNothing.in doc/Makefile && - make && - make DESTDIR=$JEHANNE/pkgs/libmpc/1.1.0/ install -) >> $WORKING_DIR/gcc.build.log -failOnError $? "Building libmpc" -echo done. - -# Copy to /posix (to emulate bind during cross compilation) -cp -pfr $JEHANNE/pkgs/libmpc/1.1.0/posix/* $JEHANNE/posix +#echo -n Building binutils... | tee -a $WORKING_DIR/gcc.build.log +#( +# cd src/libmpc && +# chmod u+w config.sub && +# patch -p0 < $WORKING_DIR/patch/libmpc.patch && +# chmod u-w config.sub && +# ./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE --with-gmp=$JEHANNE/pkgs/libgmp/6.1.2/posix/ --with-mpfr=$JEHANNE/pkgs/libmpfr/4.0.1/posix/ && +# cp ../../../../patch/MakeNothing.in doc/Makefile && +# make && +# make DESTDIR=$JEHANNE/pkgs/libmpc/1.1.0/ install +#) >> $WORKING_DIR/gcc.build.log +#failOnError $? "Building libmpc" +#echo done. +# +## Copy to /posix (to emulate bind during cross compilation) +#cp -pfr $JEHANNE/pkgs/libmpc/1.1.0/posix/* $JEHANNE/posix