CVS commit: pkgsrc/mk/check

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar  7 16:53:08 UTC 2022

Modified Files:
        pkgsrc/mk/check: check-pie.mk check-relro.mk

Log Message:
mk/check: Do not waste time checking binaries that set EMUL_PLATFORM.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/check/check-pie.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/check/check-relro.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/check/check-pie.mk
diff -u pkgsrc/mk/check/check-pie.mk:1.2 pkgsrc/mk/check/check-pie.mk:1.3
--- pkgsrc/mk/check/check-pie.mk:1.2    Mon Feb 14 00:31:18 2022
+++ pkgsrc/mk/check/check-pie.mk        Mon Mar  7 16:53:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: check-pie.mk,v 1.2 2022/02/14 00:31:18 pho Exp $
+# $NetBSD: check-pie.mk,v 1.3 2022/03/07 16:53:08 nia Exp $
 #
 # This file verifies that MKPIE (position-independent executables) was applied
 # accordingly at build-time.
@@ -29,7 +29,9 @@ _VARGROUPS+=          check-pie
 _USER_VARS.check-pie=  CHECK_PIE
 _PKG_VARS.check-pie=   CHECK_PIE_SUPPORTED
 
-.if ${_PKGSRC_MKPIE:Uno} != "no" && ${PKG_DEVELOPER:Uno:tl} != "no"
+.if ${_PKGSRC_MKPIE:Uno} != "no" && \
+    ${PKG_DEVELOPER:Uno:tl} != "no" && \
+    empty(EMUL_PLATFORMS)
 CHECK_PIE?=            yes
 .else
 CHECK_PIE?=            no

Index: pkgsrc/mk/check/check-relro.mk
diff -u pkgsrc/mk/check/check-relro.mk:1.5 pkgsrc/mk/check/check-relro.mk:1.6
--- pkgsrc/mk/check/check-relro.mk:1.5  Mon Feb  1 16:03:49 2021
+++ pkgsrc/mk/check/check-relro.mk      Mon Mar  7 16:53:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: check-relro.mk,v 1.5 2021/02/01 16:03:49 tpaul Exp $
+# $NetBSD: check-relro.mk,v 1.6 2022/03/07 16:53:08 nia Exp $
 #
 # This file verifies that RELRO (read-only relocations) was applied
 # accordingly at build-time.
@@ -30,7 +30,8 @@ _USER_VARS.check-relro=               CHECK_RELRO
 _PKG_VARS.check-relro=         CHECK_RELRO_SUPPORTED
 
 .if ${_PKGSRC_USE_RELRO:Uno} != "no" && \
-    ${PKG_DEVELOPER:Uno} != "no"
+    ${PKG_DEVELOPER:Uno} != "no" && \
+    empty(EMUL_PLATFORMS)
 CHECK_RELRO?=                  yes
 .else
 CHECK_RELRO?=                  no