mirror of
git://git.2f30.org/morpheus.git
synced 2024-06-16 13:18:33 +00:00
config.mk overrides environment so ensure the proper CFLAGS/LDFLAGS are used
This commit is contained in:
parent
c1c3da7f11
commit
45c1c79264
@ -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
|
||||
|
@ -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
|
||||
|
2
pkgs/dwm
2
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
|
||||
|
@ -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
|
||||
|
2
pkgs/sic
2
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"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user