Bläddra i källkod

help gcj/ecj both to find their dylibs on Mac as well as others

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Thorsten Glaser 13 år sedan
förälder
incheckning
afc6a2ce6b
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 1 0
      jtools/ecj/Makefile
  2. 4 3
      package/openjdk/Makefile

+ 1 - 0
jtools/ecj/Makefile

@@ -14,6 +14,7 @@ install: ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj
 
 ${STAGING_JAVA_HOST_DIR}/usr/bin/ecj:
 	env \
+		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 \
 		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$$PATH \
 	$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj -g -O2 -findirect-dispatch \

+ 4 - 3
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