mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

Fix symbol mapfile for libvm.so. Note FreeBSD still uses GNU nm(1).

Browse source
This commit is contained in:
Jung-uk Kim 2014-11-19 21:52:04 +00:00
parent 2644a67d60
commit 72fe6d5b0b
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
java/openjdk7/Makefile
View file

@ -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}/ \

52
java/openjdk7/files/patch-set
View file

@ -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 @@