From 09548f778c45f8cff71265c751481694dd3a3bee Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 31 Mar 2026 16:05:49 +0000 Subject: Add support for disabling rpath; update deps --- CONTRIBUTING | 2 +- COPYING | 2 +- INSTALL | 2 +- Makefile | 2 +- README.macosx | 4 ---- configure | 9 +++++++++ doc/index.html | 2 +- tools/configure.template | 9 +++++++++ 8 files changed, 23 insertions(+), 9 deletions(-) delete mode 100644 README.macosx 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/COPYING b/COPYING index 7640bed..9b497a1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2018-2025 Laurent Bercot +Copyright (c) 2018-2026 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index 87d5bc5..9e22f27 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.5.0 or later: http://skarnet.org/software/skalibs/ + - skalibs version 2.15.0.0 or later: http://skarnet.org/software/skalibs/ - Linux-PAM version 1.3.0 or later: http://www.linux-pam.org/library/ This software will run on any operating system that implements 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/README.macosx b/README.macosx deleted file mode 100644 index e8a44d0..0000000 --- a/README.macosx +++ /dev/null @@ -1,4 +0,0 @@ - - This package will compile and run on Darwin (MacOS), if there is an implementation -of Linux-PAM there; but the building of shared libraries is not supported. - Make sure you use the --disable-shared option to configure. diff --git a/configure b/configure index 3bfa226..5908a43 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] @@ -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 diff --git a/doc/index.html b/doc/index.html index 9d677a4..50debd8 100644 --- a/doc/index.html +++ b/doc/index.html @@ -63,7 +63,7 @@ for privilege elevation. that supports Linux-PAM - (so, probably a Linux system)
  • GNU make, version 3.81 or later
  • skalibs version -2.14.5.0 or later. It's a build-time requirement and a run-time +2.15.0.0 or later. It's a build-time requirement and a run-time requirement.
  • Linux-PAM version 1.3.0 or later. It's a build-time requirement and a run-time requirement.
    • 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