cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't link jvmti demo native libs with $ORIGIN in RPATH since ld.so

Browse Source 
does not support it yet.
- fix writes to HOME complaints
- clean up post-build target
This commit is contained in:
kurt 2007-07-06 01:35:57 +00:00
parent 22950a30f6
commit ca0e01e493
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/jdk/1.5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.40 2007/07/01 20:34:02 kurt Exp $ # $OpenBSD: Makefile,v 1.41 2007/07/06 01:35:57 kurt Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS= amd64 i386
@ -7,8 +7,8 @@ COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}" COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.5.0.11 V= 1.5.0.11
PKGNAME= jdk-${V} PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}p0 PKGNAME-main= jdk-${V}p1
PKGNAME-jre= jre-${V}p0 PKGNAME-jre= jre-${V}p1
CATEGORIES= devel/jdk java CATEGORIES= devel/jdk java
@ -178,9 +178,7 @@ post-patch:
.endif .endif
post-build: post-build:
@rm -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources \ @rm -rf ${JDKIMAGEDIR}/man/ja \
${JDKIMAGEDIR}/demo/plugin/jfc/SwingSet2/resources \
${JDKIMAGEDIR}/man/ja \
${JDKIMAGEDIR}/man/ja_JP.eucJP \ ${JDKIMAGEDIR}/man/ja_JP.eucJP \
${JREIMAGEDIR}/man/ja \ ${JREIMAGEDIR}/man/ja \
${JREIMAGEDIR}/man/ja_JP.eucJP ${JREIMAGEDIR}/man/ja_JP.eucJP

12
devel/jdk/1.5/patches/patch-deploy_make_common_Defs_gmk Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-deploy_make_common_Defs_gmk,v 1.1 2007/07/06 01:35:57 kurt Exp $
--- deploy/make/common/Defs.gmk.orig Thu Jul 5 19:03:19 2007
+++ deploy/make/common/Defs.gmk Thu Jul 5 19:05:31 2007
@@ -137,6 +137,8 @@ BIN_DIR_DBG = $(PROTO_DIR_DBG)/bin
ZIP = $(ZIPEXE)
TMPDIR = $(OUTPUTDIR)/tmp/deploy
+BINDIR = $(OUTPUTDIR)/bin
+LIBDIR = $(OUTPUTDIR)/lib
SUFFIX = $($(VARIANT)_SUFFIX)
OPT_SUFFIX =

20
devel/jdk/1.5/patches/patch-j2se_make_mkdemo_jvmti_Demo_gmk Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-j2se_make_mkdemo_jvmti_Demo_gmk,v 1.1 2007/07/06 01:35:57 kurt Exp $
--- j2se/make/mkdemo/jvmti/Demo.gmk.orig Thu Jul 5 13:57:45 2007
+++ j2se/make/mkdemo/jvmti/Demo.gmk Thu Jul 5 15:13:31 2007
@@ -154,10 +154,12 @@ ifdef USES_CRW
OTHER_LDLIBS += -R\$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR)
OTHER_LDLIBS += -R\$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR)
else
- # Add runpath options so that this library can find java_crw_demo
- OTHER_LDLIBS += -Xlinker -z -Xlinker origin
- OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR)
- OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR)
+ ifneq ($(PLATFORM), bsd)
+ # Add runpath options so that this library can find java_crw_demo
+ OTHER_LDLIBS += -Xlinker -z -Xlinker origin
+ OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_SDK_LIBARCH_DIR)
+ OTHER_LDLIBS += -Xlinker -rpath -Xlinker \$$ORIGIN/$(REL_TO_JRE_LIBARCH_DIR)
+ endif
endif
# Add dependence on java_crw_demo
OTHER_LDLIBS += -ljava_crw_demo$(SUFFIX)