Sat Aug 28 08:07:39 2021 UTC ()
mk: When using imake, pass LDFLAGS in the environment as LOCAL_LDFLAGS.
This allows RELRO to be used when building imake packages.
XXX: I'm not certain if this is the right place, but this already seems
to be cargo-culted in individual package Makefiles...


(nia)
diff -r1.69 -r1.70 pkgsrc/mk/bsd.pkg.use.mk
cvs diff -r1.69 -r1.70 pkgsrc/mk/bsd.pkg.use.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.pkg.use.mk 2020/03/12 00:12:23 1.69
+++ pkgsrc/mk/bsd.pkg.use.mk 2021/08/28 08:07:39 1.70
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.pkg.use.mk,v 1.69 2020/03/12 00:12:23 rillig Exp $ 1# $NetBSD: bsd.pkg.use.mk,v 1.70 2021/08/28 08:07:39 nia Exp $
2# 2#
3# Turn USE_* macros into proper depedency logic. Included near the top of 3# Turn USE_* macros into proper depedency logic. Included near the top of
4# bsd.pkg.mk, after bsd.prefs.mk. 4# bsd.pkg.mk, after bsd.prefs.mk.
5 5
6# Package-settable variables: 6# Package-settable variables:
7# 7#
8# USE_BSD_MAKEFILE 8# USE_BSD_MAKEFILE
9# Should be set to "yes" whenever a package uses a BSD-style 9# Should be set to "yes" whenever a package uses a BSD-style
10# Makefile. These Makefiles typically end with a line including 10# Makefile. These Makefiles typically end with a line including
11# <bsd.prog.mk>. 11# <bsd.prog.mk>.
12# Keywords: bsd make bsd.prog.mk 12# Keywords: bsd make bsd.prog.mk
13 13
14# USE_IMAKE 14# USE_IMAKE
@@ -42,26 +42,27 @@ PLIST_SUBST+= IMAKE_FILEMAN_DIR=${IMAKE @@ -42,26 +42,27 @@ PLIST_SUBST+= IMAKE_FILEMAN_DIR=${IMAKE
42PLIST_SUBST+= IMAKE_GAMEMAN_DIR=${IMAKE_GAMEMAN_DIR:Q} 42PLIST_SUBST+= IMAKE_GAMEMAN_DIR=${IMAKE_GAMEMAN_DIR:Q}
43PLIST_SUBST+= IMAKE_MISCMAN_DIR=${IMAKE_MISCMAN_DIR:Q} 43PLIST_SUBST+= IMAKE_MISCMAN_DIR=${IMAKE_MISCMAN_DIR:Q}
44PLIST_SUBST+= IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX:Q} 44PLIST_SUBST+= IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX:Q}
45PLIST_SUBST+= IMAKE_LIBMAN_SUFFIX=${IMAKE_LIBMAN_SUFFIX:Q} 45PLIST_SUBST+= IMAKE_LIBMAN_SUFFIX=${IMAKE_LIBMAN_SUFFIX:Q}
46PLIST_SUBST+= IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX:Q} 46PLIST_SUBST+= IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX:Q}
47PLIST_SUBST+= IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX:Q} 47PLIST_SUBST+= IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX:Q}
48PLIST_SUBST+= IMAKE_GAMEMAN_SUFFIX=${IMAKE_GAMEMAN_SUFFIX:Q} 48PLIST_SUBST+= IMAKE_GAMEMAN_SUFFIX=${IMAKE_GAMEMAN_SUFFIX:Q}
49PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX:Q} 49PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX:Q}
50PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q} 50PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q}
51.endif 51.endif
52 52
53.if defined(USE_IMAKE) 53.if defined(USE_IMAKE)
54MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} 54MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q}
 55MAKE_FLAGS+= LOCAL_LDFLAGS=${LDFLAGS:Q}
55.endif 56.endif
56 57
57PREFIX= ${LOCALBASE} 58PREFIX= ${LOCALBASE}
58 59
59############################################################################ 60############################################################################
60# General settings 61# General settings
61############################################################################ 62############################################################################
62 63
63### PKG_USE_KERBEROS 64### PKG_USE_KERBEROS
64 65
65.if defined(PKG_USE_KERBEROS) 66.if defined(PKG_USE_KERBEROS)
66BUILD_DEFS+= KERBEROS 67BUILD_DEFS+= KERBEROS
67.endif 68.endif