From 5a9142cab200cb5082efaae3b01d3c5c986bbce5 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 20:40:15 +0000 Subject: Install static libraries in /usr/lib Signed-off-by: Laurent Bercot --- INSTALL | 14 ++++---------- NEWS | 6 ++++++ configure | 18 +++++------------- doc/index.html | 8 ++++---- doc/upgrade.html | 12 ++++++++++++ 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/INSTALL b/INSTALL index df27fd8..35c390b 100644 --- a/INSTALL +++ b/INSTALL @@ -6,9 +6,9 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.2.0 or later: https://skarnet.org/software/skalibs/ - - s6 version 2.13.0.0 or later: https://skarnet.org/software/s6/ - - for now: s6-dns version 2.3.7.2 or later: https://skarnet.org/software/s6-dns/ + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ + - s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/ + - for now: s6-dns version 2.3.8.0 or later: https://skarnet.org/software/s6-dns/ This software will run on any operating system that implements POSIX.1-2008, available at: @@ -22,13 +22,7 @@ POSIX.1-2008, available at: will work for most users. It will install the binaries in /usr/bin and the static libraries in -/usr/lib/shibari. - - Please note that static libraries in /usr/lib/shibari *will not* -be found by a default linker invocation: you need -L/usr/lib/shibari. -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. +/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 2512e90..9b92ab4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for shibari. +In 0.0.2.0 +---------- + + - Install static libraries in /usr/lib by default. + + In 0.0.1.1 ---------- diff --git a/configure b/configure index bbc68e7..72dddc0 100755 --- a/configure +++ b/configure @@ -21,12 +21,12 @@ 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] --sysconfdir=DIR global configuration files [PREFIX/etc] 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] @@ -139,7 +139,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' sysconfdir='$prefix/etc' sysdeps='$prefix/lib/skalibs/sysdeps' @@ -202,8 +202,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 "$dynlibdir" = '$prefix/lib' ; then dynlibdir=/usr/lib @@ -363,14 +363,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 ecaa6a7..5ee63ab 100644 --- a/doc/index.html +++ b/doc/index.html @@ -53,15 +53,15 @@ related to binding. shibari is the most pleasant of them.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.14.2.0 or later. It's a build-time requirement. It's also a run-time +2.14.3.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.
  • s6 version -2.13.0.0 or later. It's a build-time requirement. It's also a run-time +2.13.0.1 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 library. That library is used for the access control and client location features in shibari-server-udp.
  • (for now) s6-dns version -2.3.7.2 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 library.
    • @@ -75,7 +75,7 @@ requirement if you link against the shared version of the s6-dns library.

    Download