morpheus

suckless linux distro
git clone git://git.2f30.org/morpheus
Log | Files | Refs | Submodules | README | LICENSE

commit 2262ca81e6be8ceab0550cf9ecb87b80f33b2427
parent 4728189aed3ad543d3c0e558b516cd2cac97d820
Author: sin <sin@2f30.org>
Date:   Fri, 28 Feb 2014 16:59:23 +0000

Use exported CFLAGS and LDFLAGS from config.mk

Diffstat:
Mconfig.mk | 7+++++--
Mpkgs/jupp | 3+--
Mpkgs/mksh | 2+-
Mpkgs/mpg123 | 3+--
Mpkgs/rsync | 2+-
Mpkgs/sbase | 2+-
Mpkgs/sdhcp | 2+-
Mpkgs/sic | 2+-
Mpkgs/sinit | 2+-
Mpkgs/smdev | 2+-
Mpkgs/tinyalsa | 2+-
Mpkgs/tinyxserver | 3+--
Mpkgs/tmux | 4++--
Mpkgs/ubase | 2+-
Mpkgs/uuterm | 2+-
Mpkgs/vim | 3++-
16 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/config.mk b/config.mk @@ -8,7 +8,10 @@ version = 0.0 mirror = http://dl.2f30.org/morpheus-pkgs/${arch}/${version} CC = ${arch}-linux-musl-gcc -optldflags = "-s -Wl,--gc-sections -Wl,-z,relro,-z,now" -optcflags = "-fdata-sections -ffunction-sections -Os -g0 -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack" +optldflags = -s -Wl,--gc-sections -Wl,-z,relro,-z,now +optcflags = -fdata-sections -ffunction-sections -Os -g0 -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack + +CFLAGS = -I${libcroot}/include -static ${optcflags} +LDFLAGS = -L${libcroot}/lib -static ${optldflags} PATH = ${root}/opt/cross/${arch}-linux-musl/bin:${PATH} diff --git a/pkgs/jupp b/pkgs/jupp @@ -5,8 +5,7 @@ build: crossmusl wget -c $url [ -d jupp ] || tar xzf joe-$v.tgz cd jupp - CC=$CC sh configure --prefix="/" CFLAGS="-I$libcroot/include" \ - LDFLAGS="-L$libcroot/lib -static" || return 1 + CC=$CC sh configure --prefix="/" || return 1 make || return 1 cp joe termidx "$root/bin" mkdir -p "$root/share/man/man1" diff --git a/pkgs/mksh b/pkgs/mksh @@ -5,7 +5,7 @@ build: crossmusl wget -c $url [ -d mksh ] || tar xzf mksh-$v.tar.gz cd mksh - CC=$CC LDFLAGS=-static sh Build.sh || return 1 + CC=$CC sh Build.sh || return 1 mkdir -p "$root/share/man/man1" "$root/share/man/cat1" cp mksh "$root/bin" cp mksh.1 "$root/share/man/man1/mksh.1" diff --git a/pkgs/mpg123 b/pkgs/mpg123 @@ -6,7 +6,6 @@ build: tinyalsa [ -d mpg123-$v ] || tar xjf mpg123-$v.tar.bz2 cd mpg123-$v CC=$CC ./configure --prefix="$root" --with-default-audio=tinyalsa \ - --enable-static=yes --enable-shared=no \ - CFLAGS="-I$libcroot/include" LDFLAGS="-L$libcroot/lib -static" || return 1 + --enable-static=yes --enable-shared=no || return 1 make || return 1 make install || return 1 diff --git a/pkgs/rsync b/pkgs/rsync @@ -5,6 +5,6 @@ build: crossmusl wget -c $url [ -d rsync-$v ] || tar xzf rsync-$v.tar.gz cd rsync-$v - CC=$CC ./configure --prefix="$root" LDFLAGS="-static" || return 1 + CC=$CC ./configure --prefix="$root" || return 1 make -j$nprocs || return 1 make install || return 1 diff --git a/pkgs/sbase b/pkgs/sbase @@ -4,5 +4,5 @@ build: crossmusl [ -d sbase ] || git clone $url cd sbase make clean - make -j$nprocs CC=$CC LDFLAGS=-static || return 1 + make -j$nprocs CC=$CC || return 1 make PREFIX="$root" install diff --git a/pkgs/sdhcp b/pkgs/sdhcp @@ -5,7 +5,7 @@ build: crossmusl [ -d sdhcp ] || tar xzf sdhcp.tar.gz cd sdhcp make clean - make CC=$CC LDFLAGS=-static || return 1 + make CC=$CC || return 1 cp sdhcp "$root/bin" || return 1 mkdir -p "$root/share/man/man8" cp sdhcp.8 "$root/share/man/man8/sdhcp.8" diff --git a/pkgs/sic b/pkgs/sic @@ -5,5 +5,5 @@ build: crossmusl [ -d sic ] || tar xzf sic.tar.gz cd sic make clean - make CC=$CC LDFLAGS=-static || return 1 + make CC=$CC || return 1 cp sic "$root/bin" diff --git a/pkgs/sinit b/pkgs/sinit @@ -4,7 +4,7 @@ build: crossmusl [ -d sinit ] || git clone $url cd sinit make clean - make -j$nprocs CC=$CC LDFLAGS=-static || return 1 + make -j$nprocs CC=$CC || return 1 make PREFIX="$root" install cd "$root" ln -sf /bin/sinit init diff --git a/pkgs/smdev b/pkgs/smdev @@ -4,5 +4,5 @@ build: crossmusl [ -d smdev ] || git clone $url cd smdev make clean - make CC=$CC LDFLAGS=-static || return 1 + make CC=$CC || return 1 make PREFIX="$root" install || return 1 diff --git a/pkgs/tinyalsa b/pkgs/tinyalsa @@ -5,7 +5,7 @@ build: crossmusl [ -d tinyalsa ] || tar xzf tinyalsa.tar.gz cd tinyalsa make clean 2>/dev/null - make CC=$CC LDFLAGS="-static" || return 1 + make CC=$CC || return 1 cp tinycap tinymix tinypcminfo tinyplay "$root/bin" cp libtinyalsa.a "$root/lib" cp -r include/tinyalsa "$root/include" diff --git a/pkgs/tinyxserver b/pkgs/tinyxserver @@ -5,8 +5,7 @@ build: tinyxlib zlib [ -d tinyxserver ] || tar xzf tinyxserver.tar.gz cd tinyxserver make clean - make CC=$CC EXTRA_CFLAGS="-D_XSERVER64=1 -I$libcroot/include" \ - LDFLAGS="-static -L$libcroot/lib" \ + make CC=$CC EXTRA_CFLAGS="-D_XSERVER64=1 $CFLAGS" \ FONTDIR="/usr/share/fonts" || return 1 make DESTDIR="$root" BINDIR="/bin" install || return 1 cd "$root/usr/share/fonts/misc" diff --git a/pkgs/tmux b/pkgs/tmux @@ -5,7 +5,7 @@ build: ncurses libevent wget -c $url [ -d tmux-$v ] || tar xzf tmux-$v.tar.gz cd tmux-$v - CC=$CC ./configure --prefix="$root" LDFLAGS="$optldflags -static" \ - CFLAGS="$optcflags -I$libcroot/include/ncursesw" || return 1 + CC=$CC ./configure --prefix="$root" \ + CFLAGS="-I$libcroot/include/ncursesw $CFLAGS" || return 1 make -j$nprocs || return 1 make install || return 1 diff --git a/pkgs/ubase b/pkgs/ubase @@ -4,6 +4,6 @@ build: crossmusl [ -d ubase ] || git clone $url cd ubase make clean - make -j$nprocs CC=$CC LDFLAGS=-static || return 1 + make -j$nprocs CC=$CC || return 1 make PREFIX="$root" install || return 1 chmod 4755 "$root/bin/su" diff --git a/pkgs/uuterm b/pkgs/uuterm @@ -5,5 +5,5 @@ build: tinyxlib [ -d uuterm ] || tar xzf uuterm.tar.gz cd uuterm make clean - make CC=$CC LDFLAGS_X11="-L$libcroot/lib -static" uuterm-x11 || return 1 + make CC=$CC LDFLAGS_X11="$LDFLAGS" uuterm-x11 || return 1 cp uuterm-x11 "$root/bin" diff --git a/pkgs/vim b/pkgs/vim @@ -5,7 +5,8 @@ build: ncurses wget -c $url [ -d vim74 ] || tar xjf vim-$v.tar.bz2 cd vim74 - CC=$CC ./configure --prefix=/ CFLAGS="-I$libcroot/include" LDFLAGS="-L$libcroot/lib -static" \ + make clean + CC=$CC ./configure --prefix=/ \ --enable-multibyte --disable-gui --with-x=no \ --disable-nls --disable-netbeans || return 1 make -j$nprocs || return 1