diff options
| author | jperkin <jperkin> | 2016-02-25 14:42:55 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-02-25 14:42:55 +0000 |
| commit | f1697a224cedcdc49c0b0c99b16590aee26322ce (patch) | |
| tree | 0285cf003fd624dc16685552fba2f200571a98ff /lang/openjdk7 | |
| parent | 8d607a3b455d084927ca49c01d40744cc95d9a66 (diff) | |
| download | pkgsrc-f1697a224cedcdc49c0b0c99b16590aee26322ce.tar.gz | |
Use OPSYSVARS.
Diffstat (limited to 'lang/openjdk7')
| -rw-r--r-- | lang/openjdk7/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 4e2c3c57e31..373cf0adcf3 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2015/12/14 23:05:11 asau Exp $ +# $NetBSD: Makefile,v 1.106 2016/02/25 14:42:56 jperkin Exp $ JDK_MICRO= 80 DISTNAME= openjdk-1.7.${JDK_MICRO}-20150609 @@ -97,8 +97,7 @@ SUBST_SED.ccspath= -e 's/UNIXCCS_PATH/UNIXCOMMAND_PATH/g' SUBST_SED.ccspath+= -e 's,/usr/ccs/bin,/usr/bin,g' .endif -.if ${OPSYS} == "SunOS" -SUBST_CLASSES+= mapfix +SUBST_CLASSES.SunOS+= mapfix SUBST_STAGE.mapfix= pre-build SUBST_FILES.mapfix= jdk/make/com/sun/java/pack/mapfile-vers SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-amd64 @@ -107,11 +106,10 @@ SUBST_SED.mapfix= -e '/__fsr_init_value/d' SUBST_SED.mapfix+= -e '/__progname/d' # environ should only be removed from this file (added by patches) -SUBST_CLASSES+= mapfix2 +SUBST_CLASSES.SunOS+= mapfix2 SUBST_STAGE.mapfix2= pre-build SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers SUBST_SED.mapfix2= -e '/environ/d' -.endif CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS |