JehanneOS
/
devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

gcc native: hopefully improvements (build.sh doesn't work yet)

This commit is contained in:
Giacomo Tesio 2018-11-27 18:53:32 +01:00
parent 229fbc9633
commit d6d8336e8a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cross/pkgs/gcc/build.sh
View File

@ -11,14 +11,12 @@ function failOnError {
# $1 -> exit status on a previous command # $1 -> exit status on a previous command
# $2 -> task description # $2 -> task description
if [ $1 -ne 0 ]; then if [ $1 -ne 0 ]; then
kill $dotter
wait $dotter 2>/dev/null
echo "ERROR $2" echo "ERROR $2"
echo echo
echo BUILD LOG: echo BUILD LOG:
echo echo
cat cross-toolchain.build.log cat $WORKING_DIR/gcc.build.log
exit $1 exit $1
fi fi
} }
@ -30,7 +28,7 @@ failOnError $? "fetching sources"
echo -n Building libgmp... echo -n Building libgmp...
( (
cd libgmp && cd src/libgmp &&
patch -p0 < $WORKING_DIR/patch/libgmp.patch && patch -p0 < $WORKING_DIR/patch/libgmp.patch &&
./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE && ./configure --host=x86_64-jehanne --prefix=/posix/ --with-sysroot=$JEHANNE &&
make && make &&
@ -44,12 +42,12 @@ cp -fr $JEHANNE/pkgs/libgmp/6.1.2/posix/* $JEHANNE/posix
echo -n Building libmpfr... echo -n Building libmpfr...
( (
cd libmpfr && cd src/libmpfr &&
patch -p0 < $WORKING_DIR/patch/libmpfr.patch && 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/ && ./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 && cp ../../../../patch/MakeNothing.in doc/Makefile &&
make && make &&
make DESTDIR=$JEHANNE/pkgs//4.0.1/ install make DESTDIR=$JEHANNE/pkgs/libmpfr/4.0.1/ install
) >> $WORKING_DIR/gcc.build.log ) >> $WORKING_DIR/gcc.build.log
failOnError $? "Building libmpfr" failOnError $? "Building libmpfr"
echo done. echo done.
@ -59,7 +57,7 @@ cp -fr $JEHANNE/pkgs/libmpfr/4.0.1/posix/* $JEHANNE/posix
echo -n Building libmpc... echo -n Building libmpc...
( (
cd libmpc && cd src/libmpc &&
chmod u+w config.sub && chmod u+w config.sub &&
patch -p0 < $WORKING_DIR/patch/libmpc.patch && patch -p0 < $WORKING_DIR/patch/libmpc.patch &&
chmod u-w config.sub && chmod u-w config.sub &&

2
cross/x86_64-jehanne-pkg-config
View File

@ -4,7 +4,7 @@
# Fill these in appropriately: # Fill these in appropriately:
export PKG_CONFIG_SYSROOT_DIR=$JEHANNE export PKG_CONFIG_SYSROOT_DIR=$JEHANNE
export PKG_CONFIG_LIBDIR=$JEHANNE/lib/pkgconfig export PKG_CONFIG_LIBDIR=$JEHANNE/posix
# TODO: If it works this should probably just be set to the empty string. # TODO: If it works this should probably just be set to the empty string.
export PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR export PKG_CONFIG_PATH=$PKG_CONFIG_LIBDIR