CVS commit: pkgsrc/lang/ghc92

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Feb 24 09:17:59 UTC 2022

Modified Files:
        pkgsrc/lang/ghc92: Makefile

Log Message:
lang/ghc92: Use ${_PKGSRC_MKPIE} instead of ${_OPSYS_SUPPORTS_MKPIE}

It's the variable that indicates if MKPIE is requested and feasible on the
platform. In fact I originally wrote a condition mentioning
${_PKGSRC_MKPIE}, but it somehow got lost while I was refactoring the code.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ghc92/Makefile

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

Modified files:

Index: pkgsrc/lang/ghc92/Makefile
diff -u pkgsrc/lang/ghc92/Makefile:1.5 pkgsrc/lang/ghc92/Makefile:1.6
--- pkgsrc/lang/ghc92/Makefile:1.5      Wed Feb 23 16:01:20 2022
+++ pkgsrc/lang/ghc92/Makefile  Thu Feb 24 09:17:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/23 16:01:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2022/02/24 09:17:59 pho Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -93,17 +93,21 @@ CONFIGURE_ENV+=     CONF_GCC_LINKER_OPTS_STA
 # the buildlink.
 .endfor
 
-# The use of internal variable in mk/bsd.prefs.mk is not very satisfying,
-# but the current infrastructure does not export a public variable
-# indicating whether a PIE build is requested or not. Note that we can't
-# build stage-1 compiler as PIE, because our bootkit libraries aren't
+# The use of internal variable ${_PKGSRC_MKPIE} in mk/bsd.prefs.mk is not
+# very satisfying, but the current infrastructure does not export a public
+# variable indicating whether a PIE build is requested or not. Note that we
+# can't build stage-1 compiler as PIE, because our bootkit libraries aren't
 # necessarily built as PIC.
 .for stage in 0 1 2
 .  if ${stage} == 0
 CONFIGURE_ENV+=        CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}
 .  else
-CONFIGURE_ENV+=        CONF_HC_OPTS_STAGE${stage}=-fPIC\ ${_OPSYS_SUPPORTS_MKPIE:D-pie}
+.    if ${_PKGSRC_MKPIE} == "yes"
+CONFIGURE_ENV+=        CONF_HC_OPTS_STAGE${stage}=-fPIC\ -pie
 CONFIGURE_ENV+=        CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}\ -fPIC
+.    else
+CONFIGURE_ENV+=        CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}
+.    endif
 .  endif
 .endfor