From 45c1c792640ccf18d00a1fefba37f6eabecd38dd Mon Sep 17 00:00:00 2001
From: sin <sin@2f30.org>
Date: Fri, 28 Feb 2014 17:26:39 +0000
Subject: [PATCH] config.mk overrides environment so ensure the proper
 CFLAGS/LDFLAGS are used

---
 pkgs/abduco | 2 +-
 pkgs/dvtm   | 2 +-
 pkgs/dwm    | 2 +-
 pkgs/sbase  | 2 +-
 pkgs/sic    | 2 +-
 pkgs/sinit  | 2 +-
 pkgs/smdev  | 2 +-
 pkgs/ubase  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/abduco b/pkgs/abduco
index 2b9dd86..d718366 100644
--- a/pkgs/abduco
+++ b/pkgs/abduco
@@ -6,7 +6,7 @@ build: crossmusl
 	make clean
 	sed -i "s@PREFIX = /usr/local@PREFIX = /@" config.mk
 	sed -i "s@INCS = -I. -I/usr/include -I/usr/local/include@INCS = -I. -I$libcroot/include@" config.mk
-	sed -i "s@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += -L$libcroot/lib ${LIBS} -static @" config.mk
+	sed -i "s@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += $LDFLAGS ${LIBS} @" config.mk
 	sed -i "s@CC = cc@CC = $CC@" config.mk
 	make || return 1
 	make DESTDIR="$root" install
diff --git a/pkgs/dvtm b/pkgs/dvtm
index 98a7333..8ab7fc4 100644
--- a/pkgs/dvtm
+++ b/pkgs/dvtm
@@ -8,7 +8,7 @@ build: ncurses
 	make clean
 	sed -i "s@PREFIX = /usr/local@PREFIX = /@" config.mk
 	sed -i "s@INCS = -I. -I/usr/include -I/usr/local/include@INCS = -I. -I$libcroot/include -I$libcroot/include/ncursesw@" config.mk
-	sed -i "s@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += -L$libcroot/lib ${LIBS} -static @" config.mk
+	sed -i 's@LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}@LDFLAGS += $LDFLAGS @" config.mk
 	sed -i "s@CC = cc@CC = $CC@" config.mk
 	make || return 1
 	make DESTDIR="$root" install
diff --git a/pkgs/dwm b/pkgs/dwm
index f04390e..0183326 100644
--- a/pkgs/dwm
+++ b/pkgs/dwm
@@ -8,7 +8,7 @@ build: tinyxlib
 	sed -i 's@PREFIX = /usr/local@PREFIX = @' config.mk
 	sed -i "s@X11INC = /usr/X11R6/include@X11INC = $libcroot/include @" config.mk
 	sed -i "s@X11LIB = /usr/X11R6/lib@X11LIB = $libcroot/lib @" config.mk
-	sed -i 's@LDFLAGS  = -s ${LIBS}@LDFLAGS = -s ${LIBS} -static @' config.mk
+	sed -i 's@LDFLAGS  = -s ${LIBS}@LDFLAGS = $LDFLAGS ${LIBS} @' config.mk
 	sed -i "s@CC = cc@CC = $CC@" config.mk
 	make || return 1
 	make DESTDIR=${root} install || return 1
diff --git a/pkgs/sbase b/pkgs/sbase
index b858947..4c072a2 100644
--- 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 || return 1
+	make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1
 	make PREFIX="$root" install
diff --git a/pkgs/sic b/pkgs/sic
index 2420cd9..6c48b5c 100644
--- 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 || return 1
+	make CC=$CC LDFLAGS="$LDFLAGS" || return 1
 	cp sic "$root/bin"
diff --git a/pkgs/sinit b/pkgs/sinit
index 3fc8a7b..8526b40 100644
--- 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 || return 1
+	make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1
 	make PREFIX="$root" install
 	cd "$root"
 	ln -sf /bin/sinit init
diff --git a/pkgs/smdev b/pkgs/smdev
index e376463..7c4df94 100644
--- a/pkgs/smdev
+++ b/pkgs/smdev
@@ -4,5 +4,5 @@ build: crossmusl
 	[ -d smdev ] || git clone $url
 	cd smdev
 	make clean
-	make CC=$CC || return 1
+	make CC=$CC LDFLAGS="$LDFLAGS" || return 1
 	make PREFIX="$root" install || return 1
diff --git a/pkgs/ubase b/pkgs/ubase
index 5128d4f..d7f764f 100644
--- 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 || return 1
+	make -j$nprocs CC=$CC LDFLAGS="$LDFLAGS" || return 1
 	make PREFIX="$root" install || return 1
 	chmod 4755 "$root/bin/su"