From 522cb49ba4a72d00b99e6a89908d6dcd3d5c4417 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 31 Mar 2026 11:26:30 +0000 Subject: Add support for disabling rpath; update deps --- CONTRIBUTING | 2 +- INSTALL | 6 +++--- Makefile | 2 +- NEWS | 2 ++ configure | 9 +++++++++ doc/index.html | 6 +++--- doc/upgrade.html | 3 ++- tools/configure.template | 9 +++++++++ 8 files changed, 30 insertions(+), 9 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 b0e2b19..d65f574 100644 --- a/INSTALL +++ b/INSTALL @@ -6,9 +6,9 @@ Build Instructions - A Linux-based system with a standard C development environment - GNU make version 3.81 or later - - skalibs version 2.14.6.0 or later: https://skarnet.org/software/skalibs/ - - optional: nsss version 0.2.1.1 or later: https://skarnet.org/software/nsss/ - - optional: execline version 2.9.8.1 or later: https://skarnet.org/software/execline/ + - skalibs version 2.15.0.0 or later: https://skarnet.org/software/skalibs/ + - optional: nsss version 0.2.1.2 or later: https://skarnet.org/software/nsss/ + - optional: execline version 2.9.8.2 or later: https://skarnet.org/software/execline/ This software is Linux-specific. It will run on a Linux kernel, version 2.6.10 or later. 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 1a27c80..c335269 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ In 0.1.8.2 ---------- - Bugfixes. + - Support for disabling RPATH at configure time. + - Adaptation to skalibs-2.15.0.0. In 0.1.8.1 diff --git a/configure b/configure index 0975ff0..92c119b 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] @@ -152,6 +153,7 @@ shlibext=so shared=false static=true allpic=true +rpath=true slashpackage=false abspath=false pcw=false @@ -200,6 +202,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 ; ;; @@ -504,6 +508,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 1a89772..4042799 100644 --- a/doc/index.html +++ b/doc/index.html @@ -102,16 +102,16 @@ and does not pull in any unnecessary code. The Linux kernel must be 2.6.10 or later.
  • GNU make, version 3.81 or later
  • skalibs version -2.14.6.0 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.
  • Optionally: nsss -version 0.2.1.1 or later. It's a build-time and run-time requirement, if +version 0.2.1.2 or later. It's a build-time and run-time requirement, if you use the --enable-nsss option to configure; but you would only do that if you're replacing nsswitch on your whole system, and most people are not.
  • Optionally: execline -version 2.9.8.1 or later. It's a only a run-time requirement, and only +version 2.9.8.2 or later. It's a only a run-time requirement, and only if your mdev.conf file contains +, - or & command directives.
    • diff --git a/doc/upgrade.html b/doc/upgrade.html index 97390ea..f449a33 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -21,8 +21,9 @@

    in 0.1.8.2

    in 0.1.8.1

    diff --git a/tools/configure.template b/tools/configure.template index ac8ac86..b693f5c 100755 --- a/tools/configure.template +++ b/tools/configure.template @@ -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] @@ -151,6 +152,7 @@ shlibext=so shared=false static=true allpic=true +rpath=true slashpackage=false abspath=false pcw=false @@ -199,6 +201,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 ; ;; @@ -502,6 +506,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 -- cgit v1.3.1