summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorThorsten Glaser <tg@mirbsd.org>2011-04-02 20:53:19 +0000
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-02 22:54:50 +0200
commitafc6a2ce6bfdb25f47a0303f94c872aadbbb7e8c (patch)
treee4bb3f3e1808317eb883961cdbf2a55243093bbd /package
parent7f60e6cf0e0bf73ffd396f7198627c8922d4865b (diff)
help gcj/ecj both to find their dylibs on Mac as well as others
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Diffstat (limited to 'package')
-rw-r--r--package/openjdk/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 2f861e053..5b1a8fa2c 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -61,8 +61,10 @@ do-extract:
(cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz)
pre-configure:
- (cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
+ cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status};\
env JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" \
+ DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
+ LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 \
./configure \
--enable-bootstrap \
--enable-zero \
@@ -80,8 +82,7 @@ pre-configure:
--without-rhino \
--disable-xrender \
--disable-nss \
- );
- (cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE})
+ && ${MAKE}
openjdk-install:
$(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin