diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-04-29 01:39:06 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-04-29 01:39:06 +0000 |
| commit | fb0a14ecd15fe851dc08ad19f54bb44fa7f34294 (patch) | |
| tree | 5a9b8253ba29bd5a7dc7b8d51762a6dff24578ce | |
| parent | 0a089d60eebe01ad919a3b04645aebe026453f49 (diff) | |
| download | s6-linux-utils-fb0a14ecd15fe851dc08ad19f54bb44fa7f34294.tar.gz | |
More build fixes
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rwxr-xr-x | configure | 15 | ||||
| -rwxr-xr-x | tools/configure.template | 4 | ||||
| -rwxr-xr-x | tools/gen-configure.el | 4 |
3 files changed, 14 insertions, 9 deletions
@@ -23,6 +23,7 @@ Fine tuning of the installation directories: --libexecdir=DIR package-scoped executables [EPREFIX/libexec] --libdir=DIR static library files [PREFIX/lib] --includedir=DIR C header files [PREFIX/include] + --sysconfdir=DIR global configuration files [PREFIX/etc] --pkgconfdir=DIR pkg-config .pc files [PREFIX/lib/pkgconfig] If no --prefix option is given, by default libdir (but not dynlibdir) will be @@ -144,6 +145,7 @@ libexecdir='$exec_prefix/libexec' bindir='$exec_prefix/bin' libdir='$prefix/lib' includedir='$prefix/include' +sysconfdir='$prefix/etc' pkgconfdir='$prefix/lib/pkgconfig' shebangdir='$bindir' sysdeps='$prefix/lib/skalibs/sysdeps' @@ -182,10 +184,11 @@ for arg ; do --bindir=*) bindir=${arg#*=} ;; --libdir=*) libdir=${arg#*=} ;; --includedir=*) includedir=${arg#*=} ;; + --sysconfdir=*) sysconfdir=${arg#*=} ;; --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} ;; @@ -242,7 +245,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir sysdeps sproot shebangdir ; do +for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot shebangdir ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -413,7 +416,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 @@ -449,6 +452,7 @@ libexecdir := $libexecdir bindir := $bindir libdir := $libdir includedir := $includedir +sysconfdir := $sysconfdir pkgconfdir := $pkgconfdir sysdeps := $sysdeps slashpackage := $slashpackage @@ -472,7 +476,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 @@ -548,8 +552,9 @@ else echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$libexecdir/\"" fi echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\"" +echo "#define ${package_macro_name}_SYSCONFPREFIX \"$sysconfdir/\"" echo "#define RNGSEED_DIR \"$seeddir\"" 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 } |