From 06fb5c2b5ac19a04e9519651e86f84cd34e66945 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Apr 2011 17:39:13 +0200 Subject: add new dirs to clean targets --- mk/build.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index acc0d0351..faa39e258 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -234,7 +234,7 @@ cleandir: rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \ ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) - rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) + rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR) rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk cleantarget: @@ -248,9 +248,9 @@ distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d + ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR) @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) - @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) + @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR) @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* @@ -477,9 +477,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d + ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR) @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR) - @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) + @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) $(STAGING_JAVA_HOST_DIR) @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG -- cgit v1.2.3 From 7ef2ed68088d30f40297153e9130cdbf21c0e334 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Apr 2011 17:46:32 +0200 Subject: fix configure options when native building --- mk/pkg-bottom.mk | 5 +---- mk/vars.mk | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index ff7bd5638..49bae85f8 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -72,10 +72,7 @@ else ifeq ($(strip ${CONFIG_STYLE}),) done; cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${CONFIGURE_ENV} \ - ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ - --build=${GNU_HOST_NAME} \ - --host=${GNU_TARGET_NAME} \ - --target=${GNU_TARGET_NAME} \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} ${CONFIGURE_TRIPLE} \ --program-prefix= \ --program-suffix= \ --prefix=/usr \ diff --git a/mk/vars.mk b/mk/vars.mk index 6aad509de..d9edef6e7 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -50,9 +50,11 @@ GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux ifeq ($(ADK_NATIVE),y) TARGET_CROSS:= TARGET_COMPILER_PREFIX?= +CONFIGURE_TRIPLE:= else TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} +CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME} endif ifneq ($(strip ${ADK_USE_CCACHE}),) -- cgit v1.2.3 From c994348c75f154eecb5ff48392b40c45ec80de55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 3 Apr 2011 20:12:52 +0200 Subject: fix extraction problems --- mk/buildhlp.mk | 4 ++++ package/openjdk/Makefile | 7 ++++--- package/openjdk/patches/patch-icedtea6-1_10_Makefile_in | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'mk') 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} ; \ -- cgit v1.2.3