Skip to content

Commit

Permalink
fix raspberry pi build
Browse files Browse the repository at this point in the history
  • Loading branch information
vanbwodonk committed Feb 7, 2020
1 parent 908d019 commit d319172
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ if [ "x$uname_string" == "xlinux" ] ; then
HOST_NATIVE="$host_arch"-linux-gnu
READLINK=readlink
#JOBS=`grep ^processor /proc/cpuinfo|wc -l`
JOBS=2
JOBS=1
GCC_CONFIG_OPTS_LCPP="--with-host-libstdcxx=-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm"
MD5="md5sum -b"
PACKAGE_NAME_SUFFIX="${host_arch}-linux"
Expand Down
23 changes: 12 additions & 11 deletions build-prerequisites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ umask 022

exec < /dev/null

# Added for Raspberry Pi
LIBRARY_PATH=/usr/lib/$(gcc -print-multiarch)
CPATH=/usr/include/$(gcc -print-multiarch)
export LIBRARY_PATH CPATH

script_path=`cd $(dirname $0) && pwd -P`
. $script_path/build-common.sh

Expand Down Expand Up @@ -140,7 +135,8 @@ echo Task [I-1] /$HOST_NATIVE/gmp/
rm -rf $BUILDDIR_NATIVE/gmp && mkdir -p $BUILDDIR_NATIVE/gmp
pushd $BUILDDIR_NATIVE/gmp

CPPFLAGS="-fexceptions" $SRCDIR/$GMP/configure \
CPPFLAGS="-fexceptions" $SRCDIR/$GMP/configure --build=$BUILD \
--host=$HOST_NATIVE \
--prefix=$BUILDDIR_NATIVE/host-libs/usr \
--enable-cxx \
--disable-shared \
Expand All @@ -155,7 +151,8 @@ echo Task [I-2] /$HOST_NATIVE/mpfr/
rm -rf $BUILDDIR_NATIVE/mpfr && mkdir -p $BUILDDIR_NATIVE/mpfr
pushd $BUILDDIR_NATIVE/mpfr

$SRCDIR/$MPFR/configure \
$SRCDIR/$MPFR/configure --build=$BUILD \
--host=$HOST_NATIVE \
--target=$TARGET \
--prefix=$BUILDDIR_NATIVE/host-libs/usr \
--disable-shared \
Expand All @@ -171,7 +168,8 @@ echo Task [I-3] /$HOST_NATIVE/mpc/
rm -rf $BUILDDIR_NATIVE/mpc && mkdir -p $BUILDDIR_NATIVE/mpc
pushd $BUILDDIR_NATIVE/mpc

$SRCDIR/$MPC/configure \
$SRCDIR/$MPC/configure --build=$BUILD \
--host=$HOST_NATIVE \
--target=$TARGET \
--prefix=$BUILDDIR_NATIVE/host-libs/usr \
--disable-shared \
Expand All @@ -188,7 +186,8 @@ echo Task [I-4] /$HOST_NATIVE/isl/
rm -rf $BUILDDIR_NATIVE/isl && mkdir -p $BUILDDIR_NATIVE/isl
pushd $BUILDDIR_NATIVE/isl

$SRCDIR/$ISL/configure \
$SRCDIR/$ISL/configure --build=$BUILD \
--host=$HOST_NATIVE \
--target=$TARGET \
--prefix=$BUILDDIR_NATIVE/host-libs/usr \
--disable-shared \
Expand All @@ -204,7 +203,8 @@ echo Task [I-5] /$HOST_NATIVE/libelf/
rm -rf $BUILDDIR_NATIVE/libelf && mkdir -p $BUILDDIR_NATIVE/libelf
pushd $BUILDDIR_NATIVE/libelf

$SRCDIR/$LIBELF/configure \
$SRCDIR/$LIBELF/configure --build=$BUILD \
--host=$HOST_NATIVE \
--target=$TARGET \
--prefix=$BUILDDIR_NATIVE/host-libs/usr \
--disable-shared \
Expand All @@ -219,7 +219,8 @@ echo Task [I-6] /$HOST_NATIVE/expat/
rm -rf $BUILDDIR_NATIVE/expat && mkdir -p $BUILDDIR_NATIVE/expat
pushd $BUILDDIR_NATIVE/expat

$SRCDIR/$EXPAT/configure \
$SRCDIR/$EXPAT/configure --build=$BUILD \
--host=$HOST_NATIVE \
--target=$TARGET \
--prefix=$BUILDDIR_NATIVE/host-libs/usr \
--disable-shared \
Expand Down
10 changes: 5 additions & 5 deletions build-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,18 @@ if [ $# -gt 3 ] ; then
usage
fi

skip_mingw32=no
skip_mingw32=yes
BUILD_OPTIONS="-g -O2"
is_ppa_release=no
is_native_build=yes
is_debug_build=no
skip_manual=no
skip_howto=no
skip_manual=yes
skip_howto=yes
skip_package_sources=no
skip_md5_checksum=no
skip_steps=
skip_gdb_with_python=no
skip_mingw32_gdb_with_python=no
skip_gdb_with_python=yes
skip_mingw32_gdb_with_python=yes
build_type=

MULTILIB_LIST="--with-multilib-list=rmprofile"
Expand Down

0 comments on commit d319172

Please sign in to comment.