Bladeren bron

fix openjdk build, do not interfere with xbmc

Waldemar Brodkorb 11 jaren geleden
bovenliggende
commit
eb339e5dac
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 2 2
      package/ecj/Makefile
  2. 2 2
      package/openjdk7/Makefile

+ 2 - 2
package/ecj/Makefile

@@ -33,8 +33,8 @@ ecj-hostinstall:
 	# put a wrapper for java here
 	mv ${STAGING_HOST_DIR}/usr/bin/gij ${STAGING_HOST_DIR}/usr/bin/gij.native
 	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
-		${STAGING_HOST_DIR}/usr/bin/java
-	chmod u+x ${STAGING_HOST_DIR}/usr/bin/java
+		${STAGING_HOST_DIR}/usr/bin/hostjava
+	chmod u+x ${STAGING_HOST_DIR}/usr/bin/hostjava
 	echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/gij.native \"\$$@\"" > \
 		${STAGING_HOST_DIR}/usr/bin/gij
 	chmod u+x ${STAGING_HOST_DIR}/usr/bin/gij

+ 2 - 2
package/openjdk7/Makefile

@@ -114,9 +114,9 @@ HOST_CONFIGURE_ARGS+=\
 		--enable-bootstrap \
 		--enable-zero \
 		--with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \
-		--with-java=$(STAGING_HOST_DIR)/usr/bin/java \
+		--with-java=$(STAGING_HOST_DIR)/usr/bin/hostjava \
 		--with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \
-		--with-ecj-jar=${DL_DIR}/ecj.jar \
+		--with-ecj-jar=${DL_DIR}/ecj-4.9.jar \
 		--without-hotspot-build \
                 --disable-system-zlib \
                 --disable-system-jpeg \