Browse Source

reduce openjdk build dependencies

Waldemar Brodkorb 9 years ago
parent
commit
669e7ea4b5
4 changed files with 13 additions and 18 deletions
  1. 6 4
      package/ant/Makefile
  2. 2 8
      package/jikes/Makefile
  3. 2 2
      package/libxslt/Makefile
  4. 3 4
      package/openjdk7/Makefile

+ 6 - 4
package/ant/Makefile

@@ -29,10 +29,12 @@ host-build:
 		cd $(WRKBUILD)/lib/optional; wget http://openadk.org/distfiles/junit-4.9b2.jar; \
 	fi
 	cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar
-	cd ${WRKBUILD}; export BOOTJAVAC_OPTS="-bootclasspath $(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \
-		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 \
-		JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ; \
-		$(BASH) build.sh
+	(cd ${WRKBUILD}; \
+		export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\
+		export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\
+		export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\
+		export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\
+		$(BASH) ./build.sh)
 
 ant-hostinstall:
 	cd $(WRKBUILD)/dist; \

+ 2 - 8
package/jikes/Makefile

@@ -12,6 +12,8 @@ PKG_BUILDDEP:=		jikes-host
 PKG_SECTION:=		dev/lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
+PKG_CFLINE_JIKES:=	depends on ADK_HOST_ONLY
+
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 include $(ADK_TOPDIR)/mk/host.mk
@@ -20,13 +22,5 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
 $(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-hostpost-install:
-	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/bin/
-	$(INSTALL_DIR) ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/
-	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
-	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
-
-jikes-install:
-
 include ${ADK_TOPDIR}/mk/host-bottom.mk
 include ${ADK_TOPDIR}/mk/pkg-bottom.mk

+ 2 - 2
package/libxslt/Makefile

@@ -7,10 +7,10 @@ PKG_NAME:=		libxslt
 PKG_VERSION:=		1.1.28
 PKG_RELEASE:=		2
 PKG_HASH:=		5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c
-PKG_DESCR:=		xslt Library
+PKG_DESCR:=		xslt library
 PKG_SECTION:=		libs/data
 PKG_DEPENDS:=		libxml2 libstdcxx
-PKG_BUILDDEP:=		libxml2
+PKG_BUILDDEP:=		libxslt-host libxml2
 HOST_BUILDDEP:=		libxml2-host
 PKG_URL:=		http://xmlsoft.org/XSLT
 PKG_SITES:=		http://xmlsoft.org/sources/

+ 3 - 4
package/openjdk7/Makefile

@@ -12,10 +12,9 @@ PKG_SECTION:=		dev/lang
 PKG_BUILDDEP:=		openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst
 PKG_BUILDDEP+=		libpng giflib libgtk2 glib fontconfig nss
-HOST_BUILDDEP:=		fastjar-host gcj-host ecj-host classpath-host jamvm-host
-HOST_BUILDDEP+=		jikes-host ant-host libXtst-host libXt-host libXinerama-host
-HOST_BUILDDEP+=		cups-host qemu-host alsa-lib-host freetype-host unzip-host
-HOST_BUILDDEP+=		libxslt-host
+HOST_BUILDDEP:=		fastjar-host gcj-host ecj-host unzip-host
+HOST_BUILDDEP+=		ant-host libXtst-host libXt-host libXinerama-host
+HOST_BUILDDEP+=		cups-host qemu-host alsa-lib-host freetype-host	libxslt-host
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi cups
 PKG_DEPENDS+=		libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo
 PKG_DEPENDS+=		libpng giflib libgtk2 glib fontconfig