From 9cbb088ed47e72665efd40c9cabef37be77edd40 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 20:26:23 +0000 Subject: Prepare for 0.0.5.1; install static libraries in /usr/lib by default Signed-off-by: Laurent Bercot --- INSTALL | 4 ++-- NEWS | 6 ++++++ configure | 18 +++++------------- doc/index.html | 6 +++--- doc/upgrade.html | 10 ++++++++++ package/info | 2 +- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/INSTALL b/INSTALL index 8037c0c..358a8d7 100644 --- a/INSTALL +++ b/INSTALL @@ -6,8 +6,8 @@ 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/ - - (optional but recommended): s6-networking version 2.7.0.3 or later: + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ + - (optional but recommended): s6-networking version 2.7.0.4 or later: https://skarnet.org/software/s6-networking/ This software will run on any operating system that implements diff --git a/NEWS b/NEWS index abd5caf..2f7f3f1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for tipidee. +In 0.0.5.1 +---------- + + - Install static libraries in /usr/lib by default. + + In 0.0.5.0 ---------- 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 f684cc4..7771f37 100644 --- a/doc/index.html +++ b/doc/index.html @@ -111,11 +111,11 @@ make it shorter. Just like the code.
  • 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.
  • Recommended at run-time: s6-networking version -2.7.0.3 or later. It's not a strict requirement, but tipidee relies on a super-server such as +2.7.0.4 or later. It's not a strict requirement, but tipidee relies on a super-server such as s6-tcpserver to listen to the network and provide connection information via environment variables. It also defers to tools such as @@ -143,7 +143,7 @@ Don't take my word for it; try it out for yourself.