pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/rhash Fix dynamic linking with rhash



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b0b6d418f1c
branches:  trunk
changeset: 459319:0b0b6d418f1c
user:      nros <nros%pkgsrc.org@localhost>
date:      Sun Oct 03 17:34:11 2021 +0000

description:
Fix dynamic linking with rhash

Make the rhash package install a .so file
not just .so.0 so that -lrhash use
dynamic linking not static linking.
Remove depmethod build since the package now
works with dynamic linking.
While here add pkgconfig override to pkgconfig
file.
Bump PKGREVISION due to PLIST change.

diffstat:

 misc/rhash/Makefile      |  9 ++++++---
 misc/rhash/PLIST         |  3 ++-
 misc/rhash/buildlink3.mk |  4 +---
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 8d81a18d2bea -r 0b0b6d418f1c misc/rhash/Makefile
--- a/misc/rhash/Makefile       Sun Oct 03 17:31:23 2021 +0000
+++ b/misc/rhash/Makefile       Sun Oct 03 17:34:11 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2021/10/02 20:54:57 jklos Exp $
+# $NetBSD: Makefile,v 1.18 2021/10/03 17:34:11 nros Exp $
 
 DISTNAME=      rhash-1.4.2
-PKGREVISION=    1
+PKGREVISION=    2
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rhash/}
 GITHUB_PROJECT=        RHash
@@ -24,10 +24,13 @@
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-INSTALL_TARGET=                install install-pkg-config
+INSTALL_TARGET=                install install-pkg-config install-lib-so-link
 INSTALLATION_DIRS=     share/examples/rhash
 TEST_TARGET=           test
 
+PKGCONFIG_OVERRIDE=            dist/librhash.pc
+PKGCONFIG_OVERRIDE_STAGE=      post-configure
+
 CONF_FILES+=   ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc
 
 post-install:
diff -r 8d81a18d2bea -r 0b0b6d418f1c misc/rhash/PLIST
--- a/misc/rhash/PLIST  Sun Oct 03 17:31:23 2021 +0000
+++ b/misc/rhash/PLIST  Sun Oct 03 17:34:11 2021 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2018/03/17 08:02:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/10/03 17:34:11 nros Exp $
 bin/rhash
 include/rhash.h
 include/rhash_torrent.h
 lib/librhash.a
+lib/librhash.so
 lib/librhash.so.0
 lib/pkgconfig/librhash.pc
 man/man1/rhash.1
diff -r 8d81a18d2bea -r 0b0b6d418f1c misc/rhash/buildlink3.mk
--- a/misc/rhash/buildlink3.mk  Sun Oct 03 17:31:23 2021 +0000
+++ b/misc/rhash/buildlink3.mk  Sun Oct 03 17:34:11 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/01/18 21:48:18 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/10/03 17:34:11 nros Exp $
 
 BUILDLINK_TREE+=       rhash
 
@@ -9,8 +9,6 @@
 BUILDLINK_ABI_DEPENDS.rhash?=  rhash>=1.3.9nb1
 BUILDLINK_PKGSRCDIR.rhash?=    ../../misc/rhash
 
-BUILDLINK_DEPMETHOD.rhash?=    build
-
 .include "../../security/openssl/buildlink3.mk"
 .endif # RHASH_BUILDLINK3_MK
 



Home | Main Index | Thread Index | Old Index