From ca80bdbc949a4b6661f2955d6b316f11d3489882 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 31 Mar 2026 02:06:23 +0000 Subject: Add support for disabling rpath; prepare for 2.7.2.2 --- CONTRIBUTING | 2 +- INSTALL | 8 ++++---- Makefile | 2 +- NEWS | 7 +++++++ configure | 9 +++++++++ doc/index.html | 12 ++++++------ doc/upgrade.html | 14 ++++++++++++++ package/info | 2 +- tools/configure.template | 9 +++++++++ 9 files changed, 52 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index 3173998..bc10b3c 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -10,7 +10,7 @@ * I, the contributor, am the copyright owner of these changes * I submit these changes according to the project's license -with no additionam requirements +with no additional requirements * I understand these changes in full and will be able to respond to review comments. diff --git a/INSTALL b/INSTALL index cae2167..f49225d 100644 --- a/INSTALL +++ b/INSTALL @@ -6,10 +6,10 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.5.1 or later: https://skarnet.org/software/skalibs/ - - Optional (but recommended): execline version 2.9.8.0 or later: https://skarnet.org/software/execline/ - - s6 version 2.14.0.1 or later: https://skarnet.org/software/s6/ - - s6-dns version 2.4.1.1 or later: https://skarnet.org/software/s6-dns/ + - skalibs version 2.15.0.0 or later: https://skarnet.org/software/skalibs/ + - Optional (but recommended): execline version 2.9.8.2 or later: https://skarnet.org/software/execline/ + - s6 version 2.15.0.0 or later: https://skarnet.org/software/s6/ + - s6-dns version 2.4.1.2 or later: https://skarnet.org/software/s6-dns/ - Depending on whether you build the SSL tools, bearssl version 0.6 or later: https://bearssl.org/ or libressl version 4.2.0 or later: https://libressl.org/ diff --git a/Makefile b/Makefile index f519a87..c1197b1 100644 --- a/Makefile +++ b/Makefile @@ -188,7 +188,7 @@ lib%.a.xyzzy: exec $(RANLIB) $@ lib%.so.xyzzy: - exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$(patsubst lib%.so.xyzzy,lib%.so.$(version_M),$@) -Wl,-rpath=$(dynlibdir) $^ $(EXTRA_LIBS) $(LDLIBS) + exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$(patsubst lib%.so.xyzzy,lib%.so.$(version_M),$@) $(LDFLAGS_RPATH) $^ $(EXTRA_LIBS) $(LDLIBS) -lskarnet: $(error Unable to link against skalibs. Check that you are using the correct --with-lib or --with-dynlib options; see ./configure --help) diff --git a/NEWS b/NEWS index 2285501..68931a9 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,12 @@ Changelog for s6-networking. +In 2.7.2.2 +---------- + + - Support for disabling RPATH at configure time. + - Adaptation to skalibs-2.15.0.0. + + In 2.7.2.1 ---------- diff --git a/configure b/configure index 87c31b0..a2df425 100755 --- a/configure +++ b/configure @@ -45,6 +45,7 @@ Optional features: --disable-allstatic do not prefer linking against static libraries [enabled] --enable-static-libc make entirely static binaries [disabled] --disable-all-pic do not build executables or static libs as PIC [enabled] + --disable-rpath do not embed RPATH in libraries [enabled] --enable-pkgconfig Build and install .pc files for pkg-config [disabled] --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths hardcode absolute BINDIR/foobar paths in binaries [disabled] @@ -157,6 +158,7 @@ shlibext=so shared=false static=true allpic=true +rpath=true slashpackage=false abspath=false pcw=false @@ -207,6 +209,8 @@ for arg ; do --disable-static-libc|--enable-static-libc=no) evenmorestatic=false ;; --enable-all-pic|--enable-all-pic=yes) allpic=true ;; --disable-all-pic|--enable-all-pic=no) allpic=false ;; + --enable-rpath|--enable-rpath=yes) rpath=true ;; + --disable-rpath|--enable-rpath=no) rpath=false ;; --enable-pkgconfig|--enable-pkgconfig=yes) pcw=true ;; --disable-pkgconfig|--enable-pkgconfig=no) pcw=false ;; --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;; @@ -518,6 +522,11 @@ if $shared ; then else echo "DO_SHARED :=" fi +if $rpath ; then + echo "LDFLAGS_RPATH := -Wl,-rpath=${dynlibdir}" +else + echo "LDFLAGS_RPATH :=" +fi if $pcw ; then echo "DO_PKGCONFIG := 1" else diff --git a/doc/index.html b/doc/index.html index 4d7db2d..165bf16 100644 --- a/doc/index.html +++ b/doc/index.html @@ -55,15 +55,15 @@ as extensions to the s6 ecosystem.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.14.5.1 or later. It's a build-time requirement. It's also a run-time +2.15.0.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
  • (Optional, but recommended) execline version -2.9.8.1 or later. It's a build-time and run-time requirement.
    • +2.9.8.2 or later. It's a build-time and run-time requirement.
  • s6 version -2.14.0.1 or later. It's a build-time and run-time requirement.
    • +2.15.0.0 or later. It's a build-time and run-time requirement.
  • s6-dns version -2.4.1.1 or later. It's a build-time requirement. It's also a run-time +2.4.1.2 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the s6-dns libraries.
  • If you want to build the secure communication tools: @@ -91,8 +91,8 @@ run-time requirement if you link against its shared version.