From e9b3fdb19cb1bcabbd1926ebe05f111cac30e233 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 19:57:28 +0000 Subject: Install static libraries in /usr/lib by default Signed-off-by: Laurent Bercot --- INSTALL | 13 +++---------- NEWS | 1 + configure | 18 +++++------------- doc/index.html | 4 ++-- doc/upgrade.html | 3 ++- 5 files changed, 13 insertions(+), 26 deletions(-) diff --git a/INSTALL b/INSTALL index 4bb2844..d4e5c93 100644 --- a/INSTALL +++ b/INSTALL @@ -7,9 +7,9 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ - - Optional (but recommended): execline version 2.9.6.0 or later: https://skarnet.org/software/execline/ + - Optional (but recommended): execline version 2.9.6.1 or later: https://skarnet.org/software/execline/ - s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/ - - s6-dns version 2.3.7.3 or later: https://skarnet.org/software/s6-dns/ + - s6-dns version 2.3.8.0 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 3.9.2 or later: https://libressl.org/ @@ -27,14 +27,7 @@ POSIX.1-2008, available at: ./configure && make && sudo make install will work for most users. - It will install the binaries in /bin and the static libraries in -/usr/lib/s6-networking. - - Please note that static libraries in /usr/lib/s6-networking *will not* -be found by a default linker invocation: you need -L/usr/lib/s6-networking. -Other skarnet.org software automatically handles that case if the -default configuration is used, but if you change the configuration, -remember to use the appropriate --with-lib configure option. + It will install the binaries in /bin and the static libraries in /usr/lib. You can strip the binaries and libraries of their extra symbols via "make strip" before the "make install" phase. It will shave a few bytes diff --git a/NEWS b/NEWS index 733c90a..0c93890 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ In 2.7.0.4 ---------- - Bugfixes. + - Install static libraries in /usr/lib by default. In 2.7.0.3 diff --git a/configure b/configure index 4823155..652e52f 100755 --- a/configure +++ b/configure @@ -21,11 +21,11 @@ Fine tuning of the installation directories: --dynlibdir=DIR shared library files [PREFIX/lib] --bindir=BINDIR user executables [EPREFIX/bin] --libexecdir=DIR package-scoped executables [EPREFIX/libexec] - --libdir=DIR static library files [PREFIX/lib/$package] + --libdir=DIR static library files [PREFIX/lib] --includedir=DIR C header files [PREFIX/include] If no --prefix option is given, by default libdir (but not dynlibdir) will be - /usr/lib/$package, and includedir will be /usr/include. + /usr/lib, and includedir will be /usr/include. Dependencies: --with-sysdeps=DIR use sysdeps in DIR [PREFIX/lib/skalibs/sysdeps] @@ -144,7 +144,7 @@ exec_prefix='$prefix' dynlibdir='$prefix/lib' libexecdir='$exec_prefix/libexec' bindir='$exec_prefix/bin' -libdir='$prefix/lib/$package' +libdir='$prefix/lib' includedir='$prefix/include' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false @@ -216,8 +216,8 @@ done # Add /usr in the default default case if test -z "$prefix" ; then - if test "$libdir" = '$prefix/lib/$package' ; then - libdir=/usr/lib/$package + if test "$libdir" = '$prefix/lib' ; then + libdir=/usr/lib fi if test "$includedir" = '$prefix/include' ; then includedir=/usr/include @@ -375,14 +375,6 @@ fi LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}" -if test -z "$vpaths" ; then - while read dep ; do - base=$(basename $dep) ; - vpaths="$vpaths /usr/lib/$base" - addlibspath="$addlibspath -L/usr/lib/$base" - done < package/deps-build -fi - if $allstatic ; then LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}" tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections diff --git a/doc/index.html b/doc/index.html index 47a7adb..c795568 100644 --- a/doc/index.html +++ b/doc/index.html @@ -59,11 +59,11 @@ as extensions to the s6 ecosystem. requirement if you link against the shared version of the skalibs library.
  • (Optional, but recommended) execline version -2.9.6.0 or later. It's a build-time and run-time requirement.
    • +2.9.6.1 or later. It's a build-time and run-time requirement.
  • s6 version 2.13.0.1 or later. It's a build-time and run-time requirement.
  • s6-dns version -2.3.7.3 or later. It's a build-time requirement. It's also a run-time +2.3.8.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 s6-dns libraries.
  • If you want to build the secure communication tools: diff --git a/doc/upgrade.html b/doc/upgrade.html index 024b3b6..e502ce5 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -26,11 +26,12 @@ dependency bumped to 2.14.3.0
  • s6 dependency bumped to 2.13.0.1
  • s6-dns -dependency bumped to 2.3.7.3
    • +dependency bumped to 2.3.8.0
  • LibreSSL optional dependency bumped to 3.9.2
  • OpenSSL optional dependency bumped to 3.3.1
    • +
  • Static libraries are installed in /usr/lib by default.

    • in 2.7.0.3

    -- cgit v1.2.3