diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-04-29 01:39:17 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-04-29 01:39:17 +0000 |
| commit | 88553f4e3d3c23b987df9f230dcd6816720041ca (patch) | |
| tree | 6b046e94977d01dac6664870c7924751b230196f | |
| parent | 1feb5912e746918b5406808c8159998a66b1f7e7 (diff) | |
| download | tipidee-88553f4e3d3c23b987df9f230dcd6816720041ca.tar.gz | |
More build fixes
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rwxr-xr-x | configure | 8 | ||||
| -rwxr-xr-x | tools/configure.template | 4 | ||||
| -rwxr-xr-x | tools/gen-configure.el | 4 |
3 files changed, 8 insertions, 8 deletions
@@ -183,7 +183,7 @@ for arg ; do --pkgconfigdir=*) pkgconfigdir=${arg#*=} ;; --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;; --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ; depincpath="${depincpath}${depincpath:+ }-I$var" ;; - --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-I$var" ; vpaths="$vpaths $var" ;; + --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-L$var" ; vpaths="$vpaths $var" ;; --with-dynlib=*) var=${arg#*=} ; stripdir var ; addlibdpath="$addlibdpath -L$var" ; vpathd="$vpathd $var" ;; --with-pkgconfig=*) pkgconf=${arg#*=} ;; --with-pkgconfig) pkgconf=${PKG_CONFIG:-pkg-config} ;; @@ -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 @@ -535,4 +535,4 @@ echo "#define ${package_macro_name}_SYSCONFPREFIX \"$sysconfdir/\"" echo echo "#endif" exec 1>&3 3>&- -echo " ... done."
\ No newline at end of file +echo " ... done." 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 diff --git a/tools/gen-configure.el b/tools/gen-configure.el index 577d86f..eba63fb 100755 --- a/tools/gen-configure.el +++ b/tools/gen-configure.el @@ -23,9 +23,9 @@ multisubstitute if { - heredoc 0 ${TEMPLATE} redirfd -w 1 configure.new - s6-cat + if { heredoc 0 ${TEMPLATE} s6-cat } + s6-echo } if { s6-chmod 0755 configure.new } |