|
|
@@ -15,8 +15,9 @@ PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \
|
|
|
d526d0848c88607ce4e3a0a4edb75d50
|
|
|
PKG_DESCR:= OpenJDK Java VM
|
|
|
PKG_SECTION:= lang
|
|
|
-PKG_BUILDDEP:= alsa-lib xproto jpeg zlib libX11 libpng freetype cups
|
|
|
-PKG_BUILDDEP+= libXt libXp libXinerama libXrender libXtst
|
|
|
+PKG_BUILDDEP:= alsa-lib xproto jpeg zlib giflib libpng freetype cups
|
|
|
+PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst
|
|
|
+PKG_DEPENDS:= zlib libstdcxx libffi
|
|
|
PKG_URL:= http://openjdk.org/
|
|
|
PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \
|
|
|
http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
|
|
|
@@ -54,9 +55,8 @@ include $(TOPDIR)/mk/package.mk
|
|
|
|
|
|
$(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
|
|
|
|
|
|
-BUILD_STYLE:= manual
|
|
|
-INSTALL_STYLE:= manual
|
|
|
TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
|
|
|
+BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
|
|
|
|
|
|
ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y)
|
|
|
CONFIGURE_ARGS+= --enable-zero
|
|
|
@@ -65,11 +65,9 @@ ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y)
|
|
|
CONFIGURE_ARGS+= --enable-shark
|
|
|
endif
|
|
|
|
|
|
-BOOTSTRAPJDK:= ${WRKDIST}/bootstrap-jdk
|
|
|
CONFIGURE_ARGS+= --disable-docs \
|
|
|
- --enable-bootstrap \
|
|
|
+ --disable-bootstrap \
|
|
|
--enable-openjdk-cross-compilation \
|
|
|
- --with-cc-for-build=$(CC_FOR_BUILD) \
|
|
|
--with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
|
|
|
--with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
|
|
|
--with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
|
|
|
@@ -83,12 +81,12 @@ CONFIGURE_ARGS+= --disable-docs \
|
|
|
--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
|
|
|
--without-rhino
|
|
|
|
|
|
-OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar"
|
|
|
-OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
|
|
|
-OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64
|
|
|
-OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj
|
|
|
+MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
|
|
|
+ GCC_HONOUR_COPTS=s
|
|
|
|
|
|
-OPENJDK_BUILD_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin
|
|
|
+OPENJDK_NATIVE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
|
|
|
+ GCC_HONOUR_COPTS=s
|
|
|
+ALL_TARGET:= icedtea
|
|
|
|
|
|
do-extract:
|
|
|
cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \
|
|
|
@@ -96,35 +94,43 @@ do-extract:
|
|
|
cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz
|
|
|
cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
|
|
|
mkdir -p ${WRKBUILD}/drops
|
|
|
- cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \
|
|
|
- ${WRKBUILD}/drops
|
|
|
+ cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip ${WRKBUILD}/drops
|
|
|
|
|
|
pre-configure:
|
|
|
cd ${WRKBUILD}; rm -rf config.{cache,status}; \
|
|
|
export ${OPENJDK_NATIVE_ENV}; ./configure \
|
|
|
- --enable-bootstrap \
|
|
|
- --enable-zero \
|
|
|
- --disable-openjdk-cross-compilation \
|
|
|
- --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
|
|
|
- --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \
|
|
|
- --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \
|
|
|
- --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \
|
|
|
- --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
|
|
|
- --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \
|
|
|
- --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
|
|
|
- --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
|
|
|
- --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
|
|
|
- --without-rhino \
|
|
|
- --disable-docs \
|
|
|
- && $(MAKE) && $(CP) $(WRKSRC)/openjdk.build/j2sdk-image ${WRKDIST}/bootstrap-jdk && $(MAKE) clean && rm -rf ${WRKBUILD}/openjdk-old
|
|
|
-
|
|
|
-do-build:
|
|
|
- cd ${WRKBUILD}; export $(OPENJDK_BUILD_ENV); make
|
|
|
-
|
|
|
-do-install:
|
|
|
- cd ${WRKBUILD}; make install
|
|
|
+ ${CONFIGURE_TRIPLE} \
|
|
|
+ --prefix=/usr \
|
|
|
+ --bindir=/usr/bin \
|
|
|
+ --datadir=/usr/share \
|
|
|
+ --mandir=/usr/share/man \
|
|
|
+ --libexecdir=/usr/libexec \
|
|
|
+ --localstatedir=/var \
|
|
|
+ --sysconfdir=/etc \
|
|
|
+ --enable-bootstrap \
|
|
|
+ --enable-zero \
|
|
|
+ --enable-openjdk-cross-compilation \
|
|
|
+ --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \
|
|
|
+ --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \
|
|
|
+ --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \
|
|
|
+ --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \
|
|
|
+ --with-jdk-home=$(BOOTSTRAPJDK) \
|
|
|
+ --with-java=$(BOOTSTRAPJDK)/bin/java \
|
|
|
+ --with-javac=$(BOOTSTRAPJDK)/bin/javac \
|
|
|
+ --with-javah=$(BOOTSTRAPJDK)/bin/javah \
|
|
|
+ --with-jar=$(BOOTSTRAPJDK)/bin/jar \
|
|
|
+ --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
|
|
|
+ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
|
|
|
+ --without-rhino ;\
|
|
|
+ $(MAKE) icedtea-ecj
|
|
|
+ # fixup symlinks to bootstrapjdk
|
|
|
+ ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java
|
|
|
+ ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac
|
|
|
+ ln -sf $(BOOTSTRAPJDK)/bin/javah $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javah
|
|
|
+ ln -sf $(BOOTSTRAPJDK)/bin/jar $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/jar
|
|
|
|
|
|
openjdk-install:
|
|
|
- $(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin
|
|
|
+ $(INSTALL_DIR) $(IDIR_OPENJDK)/usr
|
|
|
+ $(CP) $(WRKBUILD)/openjdk.build/j2re-image/* $(IDIR_OPENJDK)/usr
|
|
|
|
|
|
include ${TOPDIR}/mk/pkg-bottom.mk
|
wbx