summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/buildhlp.mk4
-rw-r--r--package/openjdk/Makefile7
-rw-r--r--package/openjdk/patches/patch-icedtea6-1_10_Makefile_in2
3 files changed, 9 insertions, 4 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 2cb4f1714..3c79fc1e8 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -47,7 +47,11 @@ ${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
ifeq (${_CHECKSUM_COOKIE},)
rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
endif
+ifeq ($(EXTRACT_OVERRIDE),1)
+ ${MAKE} do-extract
+else
${EXTRACT_CMD}
+endif
@${MAKE} post-extract $(MAKE_TRACE)
touch $@
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index ff606bee3..20c231abe 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -30,13 +30,15 @@ ICEDTEA_VERSION:= 1.10
XALAN_NAME= xalan-j
XALAN_VERSION= 2_7_0
+# override generic extraction
+EXTRACT_OVERRIDE:= 1
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \
jaxp144_01.zip \
jdk6-jaf-b20.zip \
jdk6-jaxws-b20.zip \
${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz
-NO_DISTFILES:= 1
+
WRKDIST= ${WRKDIR}
WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
@@ -86,8 +88,7 @@ MAKE_ENV+= ${OPENJDK_BUILD_ENV}
do-extract:
cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; \
- tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \
- -C $(PKG_NAME)-$(PKG_VERSION)
+ tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)
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
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
index b0464fb38..50667a68a 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -27,10 +27,10 @@
- $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
- fi ; \
++ mkdir -p stamps ; \
+ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \
+ ln -s "${ADK_ECJ}" native-ecj; \
+ else \
-+ mkdir -p stamps ; \
+ if test "x$(GCJ)" != "xno"; then \
+ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \