diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-04-29 01:16:47 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-04-29 01:16:47 +0000 |
| commit | 9fb1577fa68b35e663304b90c0bfb39eab2c3b09 (patch) | |
| tree | 1caf68c16ca75bee2625a6570ef484ba8b97d2dd | |
| parent | aa9604b4f960a1f818634c8726c2127299f373d0 (diff) | |
| download | s6-linux-init-9fb1577fa68b35e663304b90c0bfb39eab2c3b09.tar.gz | |
More fixes
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | package/configure-snippets/configure_slashpackage_other | 2 | ||||
| -rwxr-xr-x | tools/configure.template | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -318,7 +318,7 @@ if $slashpackage ; then libexecdir=$bindir includedir=${home}/include pkgconfdir=${home}/pkgconfig - + skeldir=${home}/etc/skel fi # Get usable temp filenames @@ -420,7 +420,7 @@ tryldflag LDFLAGS_AUTO -Wl,--sort-common CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}" if $evenmorestatic ; then - LDFLAGS_NOSHARED=-static + LDFLAGS_NOSHARED=" -static" fi if $shared ; then @@ -507,7 +507,7 @@ CFLAGS := ${CFLAGS}${CFLAGS_POST:+ }$CFLAGS_POST LDFLAGS_AUTO := $LDFLAGS_AUTO LDFLAGS := ${LDFLAGS}${LDFLAGS_POST:+ }$LDFLAGS_POST LDFLAGS_SHARED := $LDFLAGS_SHARED -LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED +LDFLAGS_NOSHARED :=$LDFLAGS_NOSHARED CROSS_COMPILE := $cross vpath lib%.a$vpaths diff --git a/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other index 8b13789..dabc307 100644 --- a/package/configure-snippets/configure_slashpackage_other +++ b/package/configure-snippets/configure_slashpackage_other @@ -1 +1 @@ - + skeldir=${home}/etc/skel diff --git a/tools/configure.template b/tools/configure.template index 54e5ea1..51fc2b4 100755 --- a/tools/configure.template +++ b/tools/configure.template @@ -405,7 +405,7 @@ tryldflag LDFLAGS_AUTO -Wl,--sort-common CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}" if $evenmorestatic ; then - LDFLAGS_NOSHARED=-static + LDFLAGS_NOSHARED=" -static" fi if $shared ; then @@ -465,7 +465,7 @@ CFLAGS := ${CFLAGS}${CFLAGS_POST:+ }$CFLAGS_POST LDFLAGS_AUTO := $LDFLAGS_AUTO LDFLAGS := ${LDFLAGS}${LDFLAGS_POST:+ }$LDFLAGS_POST LDFLAGS_SHARED := $LDFLAGS_SHARED -LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED +LDFLAGS_NOSHARED :=$LDFLAGS_NOSHARED CROSS_COMPILE := $cross vpath lib%.a$vpaths |