CVS commit: pkgsrc/mk

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul 30 19:04:02 UTC 2023

Modified Files:
        pkgsrc/mk: bsd.prefs.mk

Log Message:
mk: RELRO is not a yes or no question.


To generate a diff of this commit:
cvs rdiff -u -r1.435 -r1.436 pkgsrc/mk/bsd.prefs.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.prefs.mk
diff -u pkgsrc/mk/bsd.prefs.mk:1.435 pkgsrc/mk/bsd.prefs.mk:1.436
--- pkgsrc/mk/bsd.prefs.mk:1.435        Tue Jul 18 12:49:46 2023
+++ pkgsrc/mk/bsd.prefs.mk      Sun Jul 30 19:04:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.435 2023/07/18 12:49:46 nia Exp $
+# $NetBSD: bsd.prefs.mk,v 1.436 2023/07/30 19:04:02 nia Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -830,7 +830,11 @@ _PKGSRC_USE_RELRO= no
 .if ${PKGSRC_USE_RELRO:tl} != "no" && \
     ${RELRO_SUPPORTED:Uyes:tl} != "no" && \
     ${_OPSYS_SUPPORTS_RELRO:Uno} == "yes"
-_PKGSRC_USE_RELRO=     yes
+.  if ${PKGSRC_USE_RELRO:tl} != "full"
+_PKGSRC_USE_RELRO=     partial
+.  else
+_PKGSRC_USE_RELRO=     full
+.  endif
 .endif
 
 # Enable Stack-Smashing Protection