Thu Nov 16 01:28:13 2017 UTC ()
Add support for CFLAGS and LDFLAGS

This notably fixes building with MKPIE or RELRO enabled.

Bump PKGREVISION, since this generates a different binary now that SSP and
FORTIFY are enabled.


(khorben)
diff -r1.5 -r1.6 pkgsrc/misc/rhash/Makefile
cvs diff -r1.5 -r1.6 pkgsrc/misc/rhash/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/rhash/Makefile 2017/08/15 08:37:47 1.5
+++ pkgsrc/misc/rhash/Makefile 2017/11/16 01:28:12 1.6
@@ -1,28 +1,32 @@ @@ -1,28 +1,32 @@
1# $NetBSD: Makefile,v 1.5 2017/08/15 08:37:47 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2017/11/16 01:28:12 khorben Exp $
2 2
3DISTNAME= rhash-1.3.5 3DISTNAME= rhash-1.3.5
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= ${MASTER_SITE_GITHUB:=rhash/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=rhash/}
6GITHUB_PROJECT= RHash 7GITHUB_PROJECT= RHash
7GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/rhash/RHash 11HOMEPAGE= https://github.com/rhash/RHash
11COMMENT= Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums 12COMMENT= Calculate/check CRC32, MD5, SHA1, GOST, TTH, BTIH or other hash sums
12LICENSE= mit 13LICENSE= mit
13 14
14WRKSRC= ${WRKDIR}/${DISTNAME:S/rh/RH/} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/rh/RH/}
15INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/examples/rhash 16INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 share/examples/rhash
16 17
 18MAKE_FLAGS+= ADDCFLAGS=${CFLAGS:Q}
 19MAKE_FLAGS+= ADDLDFLAGS=${LDFLAGS:Q}
 20
17CONF_FILES+= ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc 21CONF_FILES+= ${PREFIX}/share/examples/rhash/rhashrc ${PKG_SYSCONFDIR}/rhashrc
18 22
19do-install: 23do-install:
20 cd ${WRKSRC} && \ 24 cd ${WRKSRC} && \
21 ${INSTALL_PROGRAM} rhash ${DESTDIR}${PREFIX}/bin && \ 25 ${INSTALL_PROGRAM} rhash ${DESTDIR}${PREFIX}/bin && \
22 ${INSTALL_LIB} librhash/librhash.a ${DESTDIR}${PREFIX}/lib && \ 26 ${INSTALL_LIB} librhash/librhash.a ${DESTDIR}${PREFIX}/lib && \
23 ${INSTALL_DATA} librhash/rhash.h librhash/rhash_timing.h ${DESTDIR}${PREFIX}/include && \ 27 ${INSTALL_DATA} librhash/rhash.h librhash/rhash_timing.h ${DESTDIR}${PREFIX}/include && \
24 ${INSTALL_DATA} dist/rhash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \ 28 ${INSTALL_DATA} dist/rhash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \
25 ${INSTALL_DATA} dist/rhashrc.sample ${DESTDIR}${PREFIX}/share/examples/rhash/rhashrc 29 ${INSTALL_DATA} dist/rhashrc.sample ${DESTDIR}${PREFIX}/share/examples/rhash/rhashrc
26 30
27.include "../../security/openssl/buildlink3.mk" 31.include "../../security/openssl/buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"