Temporarily removed the recently introduced '-specs' functionality due to major compilation issues on Ubuntu 16.04.

This commit is contained in:
Ivan Davidov 2017-08-05 13:27:44 +03:00
parent 03e324c296
commit c4527ac36e
5 changed files with 16 additions and 22 deletions

View File

@ -19,10 +19,8 @@ echo "Configuring Dropbear..."
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--disable-zlib \ --disable-zlib \
--disable-loginfunc \ --disable-loginfunc
CC="$CC" \ CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS" \
LDFLAGS="$LDFLAGS"
echo "Building Dropbear..." echo "Building Dropbear..."
make -j $NUM_JOBS make -j $NUM_JOBS

View File

@ -17,12 +17,14 @@ make -j $NUM_JOBS clean
rm -rf $DESTDIR rm -rf $DESTDIR
echo "Configuring Links..." echo "Configuring Links..."
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" ./configure \ CFLAGS="$CFLAGS" ./configure \
--prefix=/usr \ --prefix=/usr \
--disable-graphics \ --disable-graphics \
--disable-utf8 \ --disable-utf8 \
--without-ipv6 \ --without-ipv6 \
--without-ssl --without-ssl \
--without-zlib \
--without-x
echo "Building Links..." echo "Building Links..."
make -j $NUM_JOBS make -j $NUM_JOBS

View File

@ -20,7 +20,7 @@ make -j $NUM_JOBS clean
rm -rf $DESTDIR rm -rf $DESTDIR
echo "Building Lua..." echo "Building Lua..."
make -j $NUM_JOBS posix CC="$CC" CFLAGS="$CFLAGS" make -j $NUM_JOBS posix CFLAGS="$CFLAGS"
make -j $NUM_JOBS install INSTALL_TOP="$DESTDIR/usr" make -j $NUM_JOBS install INSTALL_TOP="$DESTDIR/usr"

View File

@ -9,15 +9,8 @@ rm -rf $WORK_DIR/overlay/nweb
mkdir -p $WORK_DIR/overlay/nweb mkdir -p $WORK_DIR/overlay/nweb
cd $WORK_DIR/overlay/nweb cd $WORK_DIR/overlay/nweb
set -x
# nweb # nweb
$CC $CFLAGS $LDFLAGS $SRC_DIR/nweb23.c -o nweb gcc $CFLAGS $SRC_DIR/nweb23.c -o nweb
# client
#$CC $CFLAGS $LDFLAGS $SRC_DIR/client.c -o client
set +x
echo "nweb has been build." echo "nweb has been build."
@ -26,7 +19,6 @@ DESTDIR="$MAIN_SRC_DIR/work/src/minimal_overlay/rootfs"
install -d -m755 "$DESTDIR/usr" install -d -m755 "$DESTDIR/usr"
install -d -m755 "$DESTDIR/usr/bin" install -d -m755 "$DESTDIR/usr/bin"
install -m755 nweb "$DESTDIR/usr/bin/nweb" install -m755 nweb "$DESTDIR/usr/bin/nweb"
#install -m755 client "$DESTDIR/usr/bin/client"
install -d -m755 "$DESTDIR/srv/www" # FHS compliant location install -d -m755 "$DESTDIR/srv/www" # FHS compliant location
install -m644 "$SRC_DIR/index.html" "$DESTDIR/srv/www/index.html" install -m644 "$SRC_DIR/index.html" "$DESTDIR/srv/www/index.html"
install -m644 "$SRC_DIR/favicon.ico" "$DESTDIR/srv/www/favicon.ico" install -m644 "$SRC_DIR/favicon.ico" "$DESTDIR/srv/www/favicon.ico"
@ -35,4 +27,5 @@ install -d -m755 "$DESTDIR/etc/autorun"
install -m755 "$SRC_DIR/nweb.sh" "$DESTDIR/etc/autorun/90_nweb.sh" install -m755 "$SRC_DIR/nweb.sh" "$DESTDIR/etc/autorun/90_nweb.sh"
echo "nweb has been installed." echo "nweb has been installed."
echo "it will be autostarted on boot" echo "It will be autostarted on boot."

View File

@ -27,11 +27,12 @@ export NUM_JOBS=$((NUM_CORES * JOB_FACTOR))
# sysroot flags for the compiler # sysroot flags for the compiler
#-Wl,-nostdlib is required to make ld / gcc ignore the host's /usr/lib and /lib #-Wl,-nostdlib is required to make ld / gcc ignore the host's /usr/lib and /lib
ld_flags="-Wl,-nostdlib $(grep -- \"-L\" $SYSROOT_SPECS)" #ld_flags="-Wl,-nostdlib $(grep -- \"-L\" $SYSROOT_SPECS)"
#-static-libgcc is neeeded since we don't have the gcc-libs in our sysroot #-static-libgcc is neeeded since we don't have the gcc-libs in our sysroot
gcc_flags="-specs=$SYSROOT_SPECS -static-libgcc" #gcc_flags="-specs=$SYSROOT_SPECS -static-libgcc"
# $ld_flags is passed 2 times because sometimes bundles ignore one of the variables # $ld_flags is passed 2 times because sometimes bundles ignore one of the variables
export CC="${CC-gcc} $gcc_flags $ld_flags" #export CC="${CC-gcc} $gcc_flags $ld_flags"
export CFLAGS="$CFLAGS" #export CFLAGS="$CFLAGS"
export LDFLAGS="$LDFLAGS $ld_flags" #export LDFLAGS="$LDFLAGS $ld_flags"