saad/minimal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96 from TechnologyClassroom/remove-hardcoded-CFLAGS

Browse Source 
Removed hardcoded CFLAGS
This commit is contained in:
Ivan Davidov 2017-11-15 20:45:22 +02:00 committed by GitHub
commit 4e28d07dfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/minimal_overlay/bundles/nano/02_build.sh
View File

@ -18,9 +18,8 @@ rm -rf $DESTDIR
echo "Configuring nano..." echo "Configuring nano..."
CFLAGS="$CFLAGS" ./configure \ CFLAGS="$CFLAGS" ./configure \
--prefix=/usr --prefix=/usr \
--disable-utf8 \ LDFLAGS=-L$WORK_DIR/overlay/ncurses/ncurses_installed/usr/include
CFLAGS="-Os -s -fno-stack-protector -U_FORTIFY_SOURCE"
echo "Building nano..." echo "Building nano..."
make -j $NUM_JOBS make -j $NUM_JOBS

4
src/minimal_overlay/bundles/ncurses/02_build.sh
View File

@ -22,7 +22,7 @@ sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
# Configure Ncurses # Configure Ncurses
echo "Configuring Ncurses..." echo "Configuring Ncurses..."
./configure \ CFLAGS="$CFLAGS" ./configure \
--prefix=/usr \ --prefix=/usr \
--with-termlib \ --with-termlib \
--with-terminfo-dirs=/lib/terminfo \ --with-terminfo-dirs=/lib/terminfo \
@ -36,7 +36,6 @@ echo "Configuring Ncurses..."
--with-shared \ --with-shared \
CPPFLAGS=-I$PWD/ncurses/widechar \ CPPFLAGS=-I$PWD/ncurses/widechar \
LDFLAGS=-L$PWD/lib \ LDFLAGS=-L$PWD/lib \
CFLAGS="-Os -s -fno-stack-protector -U_FORTIFY_SOURCE" \
CPPFLAGS="-P" CPPFLAGS="-P"
# Most configuration switches are from AwlsomeAlex # Most configuration switches are from AwlsomeAlex
@ -68,3 +67,4 @@ cp -r $DESTDIR/usr/* $ROOTFS
echo "ncurses has been installed." echo "ncurses has been installed."
cd $SRC_DIR cd $SRC_DIR