Sun Feb 23 07:16:44 2014 UTC ()
Revert previous.
Fix build under NetBSD/amd64 6.99.32 and GCC 4.5.4.


(ryoon)
diff -r1.62 -r1.63 pkgsrc/lang/openjdk7/Makefile
cvs diff -r1.62 -r1.63 pkgsrc/lang/openjdk7/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/Makefile 2014/02/17 23:16:16 1.62
+++ pkgsrc/lang/openjdk7/Attic/Makefile 2014/02/23 07:16:44 1.63
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.62 2014/02/17 23:16:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.63 2014/02/23 07:16:44 ryoon Exp $
2 2
3DISTNAME= openjdk-1.7.51-20140125 3DISTNAME= openjdk-1.7.51-20140125
4PKGNAME= openjdk7-1.7.51 4PKGNAME= openjdk7-1.7.51
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10# Note: Remember to set sun-jre-jce when updating distinfo 10# Note: Remember to set sun-jre-jce when updating distinfo
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://openjdk.java.net/ 13HOMEPAGE= http://openjdk.java.net/
14COMMENT= Open-source implementation of the Java Platform, Standard Edition 14COMMENT= Open-source implementation of the Java Platform, Standard Edition
@@ -112,32 +112,32 @@ SUBST_CLASSES+= mapfix2 @@ -112,32 +112,32 @@ SUBST_CLASSES+= mapfix2
112SUBST_STAGE.mapfix2= pre-build 112SUBST_STAGE.mapfix2= pre-build
113SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers 113SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers
114SUBST_SED.mapfix2= -e '/environ/d' 114SUBST_SED.mapfix2= -e '/environ/d'
115.endif 115.endif
116 116
117.if !empty(PKGSRC_COMPILER:Mclang) 117.if !empty(PKGSRC_COMPILER:Mclang)
118_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \ 118_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \
119 -Wno-shorten-64-to-32 -Wno-conversion \ 119 -Wno-shorten-64-to-32 -Wno-conversion \
120 -Wno-unused-value -Wno-switch-enum -Wno-switch \ 120 -Wno-unused-value -Wno-switch-enum -Wno-switch \
121 -Wno-tautological-compare \ 121 -Wno-tautological-compare \
122 -Wno-delete-non-virtual-dtor \ 122 -Wno-delete-non-virtual-dtor \
123 -Wno-return-type -Wno-unused-parameter \ 123 -Wno-return-type -Wno-unused-parameter \
124 -Wno-parentheses-equality -Wno-empty-body 124 -Wno-parentheses-equality -Wno-empty-body
 125BUILDLINK_TRANSFORM+= rm:-fcheck-new
 126BUILDLINK_TRANSFORM+= rm:-fpch-deps
125. if ${MACHINE_ARCH} == "x86_64" 127. if ${MACHINE_ARCH} == "x86_64"
126_WRAP_EXTRA_ARGS.CXX+= -mstackrealign 128_WRAP_EXTRA_ARGS.CXX+= -mstackrealign
127. endif 129. endif
128.endif 130.endif
129BUILDLINK_TRANSFORM+= rm:-fcheck-new 
130BUILDLINK_TRANSFORM+= rm:-fpch-deps 
131.include "bootstrap.mk" 131.include "bootstrap.mk"
132.include "icedtea-extras.mk" 132.include "icedtea-extras.mk"
133 133
134.include "options.mk" 134.include "options.mk"
135 135
136SUBST_CLASSES+= add-rpaths 136SUBST_CLASSES+= add-rpaths
137SUBST_STAGE.add-rpaths= pre-build 137SUBST_STAGE.add-rpaths= pre-build
138SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles 138SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles
139SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \ 139SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \
140 jdk/make/sun/awt/mawt.gmk \ 140 jdk/make/sun/awt/mawt.gmk \
141 jdk/make/sun/jawt/Makefile \ 141 jdk/make/sun/jawt/Makefile \
142 jdk/make/sun/jdga/Makefile \ 142 jdk/make/sun/jdga/Makefile \
143 jdk/make/sun/splashscreen/Makefile \ 143 jdk/make/sun/splashscreen/Makefile \