diff options
| author | nros <nros@pkgsrc.org> | 2021-10-03 17:34:11 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2021-10-03 17:34:11 +0000 |
| commit | da45e1283771cd62c93619604f4553cb834f5325 (patch) | |
| tree | 26dd2deb2a5e87f102e6b735318c3f191e1d3405 /misc/rhash | |
| parent | 2ded1e22a2dfb72fff055306a510a66888d5bba8 (diff) | |
| download | pkgsrc-da45e1283771cd62c93619604f4553cb834f5325.tar.gz | |
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 (limited to 'misc/rhash')
| -rw-r--r-- | misc/rhash/Makefile | 9 | ||||
| -rw-r--r-- | misc/rhash/PLIST | 3 | ||||
| -rw-r--r-- | misc/rhash/buildlink3.mk | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/misc/rhash/Makefile b/misc/rhash/Makefile index 0eb98686340..27a6898d136 100644 --- a/misc/rhash/Makefile +++ b/misc/rhash/Makefile @@ -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+= --extra-ldflags=-L${PREFIX}/lib\ -Wl,-R${PREFIX}/lib\ ${LDFLAGS 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 --git a/misc/rhash/PLIST b/misc/rhash/PLIST index d81be6a85b0..1cd7565ddf8 100644 --- a/misc/rhash/PLIST +++ b/misc/rhash/PLIST @@ -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 --git a/misc/rhash/buildlink3.mk b/misc/rhash/buildlink3.mk index 8ef32ee86eb..d1614208266 100644 --- a/misc/rhash/buildlink3.mk +++ b/misc/rhash/buildlink3.mk @@ -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_API_DEPENDS.rhash+= rhash>=1.3.1 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 |