Date: Wed, 19 Nov 2014 21:52:04 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372824 - in head/java/openjdk7: . files Message-ID: <201411192152.sAJLq4GN034431@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Nov 19 21:52:04 2014 New Revision: 372824 URL: https://svnweb.freebsd.org/changeset/ports/372824 QAT: https://qat.redports.org/buildarchive/r372824/ Log: Fix symbol mapfile for libvm.so. Note FreeBSD still uses GNU nm(1). Modified: head/java/openjdk7/Makefile head/java/openjdk7/files/patch-set Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Wed Nov 19 21:27:04 2014 (r372823) +++ head/java/openjdk7/Makefile Wed Nov 19 21:52:04 2014 (r372824) @@ -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}/ \ Modified: head/java/openjdk7/files/patch-set ============================================================================== --- head/java/openjdk7/files/patch-set Wed Nov 19 21:27:04 2014 (r372823) +++ head/java/openjdk7/files/patch-set Wed Nov 19 21:52:04 2014 (r372824) @@ -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 @@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411192152.sAJLq4GN034431>