CVS commit: pkgsrc/mk/check

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 23 09:24:35 UTC 2020

Modified Files:
        pkgsrc/mk/check: check-relro.mk check-shlibs.mk check-ssp.mk

Log Message:
mk: Remove warning messages for unsupported check targets.

These appear to have been cargo culted around for a while, don't even have
anything to do with DESTDIR mode, and are completely useless.  Simplify the
logic a little while here.  Noticed by rillig@.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mk/check/check-relro.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mk/check/check-shlibs.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/check/check-ssp.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-relro.mk
diff -u pkgsrc/mk/check/check-relro.mk:1.3 pkgsrc/mk/check/check-relro.mk:1.4
--- pkgsrc/mk/check/check-relro.mk:1.3  Sun Mar  4 20:45:19 2018
+++ pkgsrc/mk/check/check-relro.mk      Mon Mar 23 09:24:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-relro.mk,v 1.3 2018/03/04 20:45:19 rillig Exp $
+# $NetBSD: check-relro.mk,v 1.4 2020/03/23 09:24:35 jperkin Exp $
 #
 # This file verifies that RELRO (read-only relocations) was applied
 # accordingly at build-time.
@@ -47,11 +47,8 @@ _CHECK_RELRO_FILELIST_CMD?=  ${SED} -e '/
        done)
 
 .if !empty(CHECK_RELRO:M[Yy][Ee][Ss]) && \
-    !empty(CHECK_RELRO_SUPPORTED:M[Yy][Ee][Ss])
-privileged-install-hook: _check-relro
-.endif
-
-.if ${_USE_CHECK_RELRO_NATIVE} == "yes"
+    !empty(CHECK_RELRO_SUPPORTED:M[Yy][Ee][Ss]) && \
+    ${_USE_CHECK_RELRO_NATIVE} == "yes"
 CHECK_RELRO_NATIVE_ENV=
 .  if ${OBJECT_FMT} == "ELF"
 USE_TOOLS+=                    readelf
@@ -68,6 +65,7 @@ CHECK_RELRO_NATIVE_ENV+=      WRKDIR=${WRKDIR
 CHECK_RELRO_NATIVE_ENV+=       CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q}
 .  endif
 
+privileged-install-hook: _check-relro
 _check-relro: error-check .PHONY
        @${STEP_MSG} "Checking for RELRO in ${PKGNAME}"
        ${RUN} rm -f ${ERROR_DIR}/${.TARGET}
@@ -83,8 +81,4 @@ _check-relro: error-check .PHONY
                ${ECHO} $$file;                                         \
        done |                                                          \
        ${PKGSRC_SETENV} ${CHECK_RELRO_NATIVE_ENV} ${AWK} -f ${CHECK_RELRO_NATIVE} > ${ERROR_DIR}/${.TARGET}
-
-.else
-_check-relro: error-check .PHONY
-       @${WARNING_MSG} "Skipping check for RELRO in DESTDIR mode."
 .endif

Index: pkgsrc/mk/check/check-shlibs.mk
diff -u pkgsrc/mk/check/check-shlibs.mk:1.31 pkgsrc/mk/check/check-shlibs.mk:1.32
--- pkgsrc/mk/check/check-shlibs.mk:1.31        Mon Oct  1 14:59:49 2018
+++ pkgsrc/mk/check/check-shlibs.mk     Mon Mar 23 09:24:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-shlibs.mk,v 1.31 2018/10/01 14:59:49 triaxx Exp $
+# $NetBSD: check-shlibs.mk,v 1.32 2020/03/23 09:24:35 jperkin Exp $
 #
 # This file verifies that all libraries used by the package can be found
 # at run-time.
@@ -54,11 +54,8 @@ _CHECK_SHLIBS_FILELIST_CMD?= ${SED} -e '
        done)
 
 .if !empty(CHECK_SHLIBS:M[Yy][Ee][Ss]) && \
-    !empty(CHECK_SHLIBS_SUPPORTED:M[Yy][Ee][Ss])
-privileged-install-hook: _check-shlibs
-.endif
-
-.if ${_USE_CHECK_SHLIBS_NATIVE} == "yes"
+    !empty(CHECK_SHLIBS_SUPPORTED:M[Yy][Ee][Ss]) && \
+    ${_USE_CHECK_SHLIBS_NATIVE} == "yes"
 CHECK_SHLIBS_NATIVE_ENV=
 .  if ${OBJECT_FMT} == "ELF"
 USE_TOOLS+=                    readelf
@@ -81,6 +78,7 @@ CHECK_SHLIBS_NATIVE_ENV+=     CHECK_WRKREF_E
 CHECK_SHLIBS_NATIVE_ENV+=      CHECK_SHLIBS_BLACKLIST=${CHECK_SHLIBS_BLACKLIST:Q}
 .  endif
 
+privileged-install-hook: _check-shlibs
 _check-shlibs: error-check .PHONY
        @${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}"
        ${RUN} rm -f ${ERROR_DIR}/${.TARGET}
@@ -96,8 +94,4 @@ _check-shlibs: error-check .PHONY
                ${ECHO} $$file;                                         \
        done |                                                          \
        ${PKGSRC_SETENV} ${CHECK_SHLIBS_NATIVE_ENV} ${AWK} -f ${CHECK_SHLIBS_NATIVE} > ${ERROR_DIR}/${.TARGET}
-
-.else
-_check-shlibs: error-check .PHONY
-       @${WARNING_MSG} "Skipping missing run-time search-path check in DESTDIR mode."
 .endif

Index: pkgsrc/mk/check/check-ssp.mk
diff -u pkgsrc/mk/check/check-ssp.mk:1.1 pkgsrc/mk/check/check-ssp.mk:1.2
--- pkgsrc/mk/check/check-ssp.mk:1.1    Tue Oct  3 09:43:06 2017
+++ pkgsrc/mk/check/check-ssp.mk        Mon Mar 23 09:24:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: check-ssp.mk,v 1.1 2017/10/03 09:43:06 jperkin Exp $
+# $NetBSD: check-ssp.mk,v 1.2 2020/03/23 09:24:35 jperkin Exp $
 #
 # This file verifies that SSP was applied accordingly at build-time.
 #
@@ -46,11 +46,8 @@ _CHECK_SSP_FILELIST_CMD?=    ${SED} -e '/^@
        done)
 
 .if !empty(CHECK_SSP:M[Yy][Ee][Ss]) && \
-    !empty(CHECK_SSP_SUPPORTED:M[Yy][Ee][Ss])
-privileged-install-hook: _check-ssp
-.endif
-
-.if ${_USE_CHECK_SSP_NATIVE} == "yes"
+    !empty(CHECK_SSP_SUPPORTED:M[Yy][Ee][Ss]) && \
+    ${_USE_CHECK_SSP_NATIVE} == "yes"
 CHECK_SSP_NATIVE_ENV=
 .  if ${OBJECT_FMT} == "ELF"
 USE_TOOLS+=            readelf
@@ -67,6 +64,7 @@ CHECK_SSP_NATIVE_ENV+=        WRKDIR=${WRKDIR:Q
 CHECK_SSP_NATIVE_ENV+= CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q}
 .  endif
 
+privileged-install-hook: _check-ssp
 _check-ssp: error-check .PHONY
        @${STEP_MSG} "Checking for SSP in ${PKGNAME}"
        ${RUN} rm -f ${ERROR_DIR}/${.TARGET}
@@ -82,8 +80,4 @@ _check-ssp: error-check .PHONY
                ${ECHO} $$file;                                 \
        done |                                                  \
        ${PKGSRC_SETENV} ${CHECK_SSP_NATIVE_ENV} ${AWK} -f ${CHECK_SSP_NATIVE} > ${ERROR_DIR}/${.TARGET}
-
-.else
-_check-ssp: error-check .PHONY
-       @${WARNING_MSG} "Skipping check for SSP in DESTDIR mode."
 .endif