debianpkg: install libraries to /usr/lib64/frr

This makes them "private libraries" (which they are, since we don't
maintain a proper versioned ABI on libfrr.)  This also properly fixes
another few lintian warnings.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debianpkg/frr-snmp.install b/debianpkg/frr-snmp.install
index 33fcdfb5981acdda82305a5505bfe8473f98b32e..5517ca7eec9a8e4034c9049fe502074523f19f5f 100644 (file)
--- a/debianpkg/frr-snmp.install
+++ b/debianpkg/frr-snmp.install
@@ -1,2 +1,2 @@
-usr/lib/*/libfrrsnmp.*
+usr/lib/*/frr/libfrrsnmp.*
 usr/lib/*/frr/modules/*_snmp.so

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index d87e06461ebca584cf1267eed91181b79e781ebd..fd4f168d1dbebd432e20630c8fd84511195c5b5e 100644 (file)
--- a/debianpkg/frr.install
+++ b/debianpkg/frr.install
@@ -1,8 +1,8 @@
 etc/frr/
 usr/bin/vtysh
 usr/bin/mtracebis
-usr/lib/*/libfrr.*
-usr/lib/*/libfrrospfapiclient.*
+usr/lib/*/frr/libfrr.*
+usr/lib/*/frr/libfrrospfapiclient.*
 usr/lib/frr/frr
 usr/lib/frr/*d
 usr/lib/frr/watchfrr

diff --git a/debianpkg/frr.lintian-overrides b/debianpkg/frr.lintian-overrides
index 7c62ec376536fb721b97dbe9deb0bbf873872af9..4df816fa05fb51b9562bea62193b56f37a5575ce 100644 (file)
--- a/debianpkg/frr.lintian-overrides
+++ b/debianpkg/frr.lintian-overrides
@@ -1,9 +1,3 @@
-# libfrr* are for internal use only and do not provide a stable API or ABI.
-# soname / library versioning is irrelevant and they must always be shipped
-# exact-matching to the daemons compiled against it
-frr binary: package-name-doesnt-match-sonames libfrr0 libfrrospfapiclient0
-frr binary: no-symbols-control-file *
-
 # we're a bit special since we provide network connectivity by starting up
 # routing protocols.
 frr binary: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/frr.service network-online.target

diff --git a/debianpkg/rules b/debianpkg/rules
index 9baec7d457a2aa25abe6d79d03c045027968d941..8e1d3e98af024598fc0899fc37a905901c4691e8 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -133,6 +133,9 @@ override_dh_auto_configure:
                --sbindir=/usr/lib/frr \
                --sysconfdir=/etc/frr \
                --with-vtysh-pager=/usr/bin/pager \
+               --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr \
+               --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr/modules \
+               LIBTOOLFLAGS="-rpath /usr/lib/$(DEB_HOST_MULTIARCH)/frr" \
                $(USE_DOC) \
                $(USE_SNMP) \
                $(USE_OSPFAPI) \
@@ -181,6 +184,10 @@ endif
 override_dh_auto_build:
        dh_auto_build -- $(MAKE_SILENT)
 
+override_dh_makeshlibs:
+# we don't need or want ldconfig for private libs
+       dh_makeshlibs -n
+
 override_dh_missing:
        dh_missing --fail-missing