diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-11-19 21:52:04 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-11-19 21:52:04 +0000 |
| commit | 72fe6d5b0b20ffcbcb5d911b3817fa57528e2a3b (patch) | |
| tree | ea3480fae4507cdf7895f778f59386d76e63d7d8 /java/openjdk7 | |
| parent | 2644a67d60775dc0d1a9f850e328c7639b8bdcd5 (diff) | |
Notes
Diffstat (limited to 'java/openjdk7')
| -rw-r--r-- | java/openjdk7/Makefile | 1 | ||||
| -rw-r--r-- | java/openjdk7/files/patch-set | 52 |
2 files changed, 36 insertions, 17 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 5608a3681f7e..e0bf206c0e32 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -3,6 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set index 02783ac57818..6542a4431183 100644 --- a/java/openjdk7/files/patch-set +++ b/java/openjdk7/files/patch-set @@ -7097,25 +7097,43 @@ +endif CFLAGS += -DVM_LITTLE_ENDIAN ---- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-10-28 20:19:39.000000000 -0700 -@@ -7,6 +7,16 @@ - NM=nm +--- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2013-09-06 14:21:59.000000000 -0400 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-11-19 15:32:05.000000000 -0500 +@@ -1,12 +1,28 @@ + #!/bin/sh + + # If we're cross compiling use that path for nm +-if [ "$CROSS_COMPILE_ARCH" != "" ]; then +-NM=$ALT_COMPILER_PATH/nm ++if [ "$CROSS_COMPILE_ARCH" != "" ]; then ++ NM=$ALT_COMPILER_PATH/nm + else +-NM=nm ++ NM=nm fi -+if [ `uname` == "OpenBSD" ] ; then -+$NM $* \ -+ | awk '{ -+ if ($2 != "U") if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" -+ if ($2 != "U") if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";" -+ if ($2 != "U") if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" -+ }' \ -+ | sort -u -+else - $NM -Uj $* | awk ' - { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 } - ' -+fi +-$NM -Uj $* | awk ' +- { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 } +- ' ++case "$(uname -s)" in ++Darwin ) ++ $NM -Uj $@ | awk '{ ++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ++ }' ;; ++OpenBSD ) ++ $NM $@ | awk '{ ++ if ($2 == "U") next ++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" ++ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";" ++ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" ++ }' | sort -u ;; ++* ) ++ $NM --defined-only $@ | awk '{ ++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" ++ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";" ++ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";" ++ }' | sort -u ;; ++esac --- ./hotspot/make/bsd/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700 +++ ./hotspot/make/bsd/makefiles/buildtree.make 2014-10-28 20:19:39.000000000 -0700 @@ -1,5 +1,6 @@ |