diff options
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/fetch.mk | 4 | ||||
-rw-r--r-- | mk/vars.mk | 6 | ||||
-rw-r--r-- | package/ecj/Makefile | 2 | ||||
-rw-r--r-- | package/gcj/Makefile | 4 | ||||
-rw-r--r-- | package/id3lib/Makefile | 2 | ||||
-rw-r--r-- | package/id3lib/patches/patch-configure | 20 | ||||
-rw-r--r-- | rules.mk | 1 | ||||
-rw-r--r-- | target/config/Config.in.adk | 7 |
9 files changed, 39 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index 42d75bbcd..0d36923d2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -143,7 +143,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M .PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean world: - mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ + mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \ $(PACKAGE_DIR) $(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \ $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh diff --git a/mk/fetch.mk b/mk/fetch.mk index a2590d467..6382571b3 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -2,9 +2,9 @@ # material, please see the LICENCE file in the top-level directory. ifneq ($(strip ${DIST_SUBDIR}),) -FULLDISTDIR?= ${DISTDIR}/${DIST_SUBDIR} +FULLDISTDIR?= ${DL_DIR}/${DIST_SUBDIR} else -FULLDISTDIR?= ${DISTDIR} +FULLDISTDIR?= ${DL_DIR} endif FULLDISTFILES= $(patsubst %,${FULLDISTDIR}/%,${DISTFILES}) diff --git a/mk/vars.mk b/mk/vars.mk index 34c9c90e2..01120b005 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -12,7 +12,11 @@ BUILD_GROUP= $(shell id -gn) # some global dirs BASE_DIR:= $(TOPDIR) -DISTDIR?= ${BASE_DIR}/dl +ifeq ($(ADK_DL_DIR),) +DL_DIR?= $(BASE_DIR)/dl +else +DL_DIR?= $(ADK_DL_DIR) +endif TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build SCRIPT_DIR:= $(BASE_DIR)/scripts STAGING_HOST_DIR:= ${BASE_DIR}/host_${GNU_HOST_NAME} diff --git a/package/ecj/Makefile b/package/ecj/Makefile index 92898307b..8e4dc6f94 100644 --- a/package/ecj/Makefile +++ b/package/ecj/Makefile @@ -24,7 +24,7 @@ ecj-hostinstall: $(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \ -o ${STAGING_HOST_DIR}/usr/bin/ecj.native \ --main=org.eclipse.jdt.internal.compiler.batch.Main \ - $(DISTDIR)/ecj.jar + $(DL_DIR)/ecj.jar echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \ ${STAGING_HOST_DIR}/usr/bin/ecj chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj diff --git a/package/gcj/Makefile b/package/gcj/Makefile index 5ff8cc810..15c56b204 100644 --- a/package/gcj/Makefile +++ b/package/gcj/Makefile @@ -41,8 +41,8 @@ HOST_CONFIGURE_ARGS:= --enable-dependency-tracking \ --disable-bootstrap post-extract: - (cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar) - (cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .) + (cd $(DL_DIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar) + (cd $(WRKBUILD); $(CP) $(DL_DIR)/ecj.jar .) include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index 389b4f39a..19d678a7a 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= id3lib PKG_VERSION:= 3.8.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7 PKG_DESCR:= An ID3v1/ID3v2 tagging library PKG_SECTION:= libs diff --git a/package/id3lib/patches/patch-configure b/package/id3lib/patches/patch-configure index 6853215af..10b0add38 100644 --- a/package/id3lib/patches/patch-configure +++ b/package/id3lib/patches/patch-configure @@ -1,6 +1,24 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- id3lib-3.8.3.orig/configure 2003-03-02 01:23:00.000000000 +0100 -+++ id3lib-3.8.3/configure 2008-12-15 13:14:18.000000000 +0100 ++++ id3lib-3.8.3/configure 2014-03-08 12:16:00.000000000 +0100 +@@ -3353,7 +3353,7 @@ irix5* | irix6*) + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + case $host_cpu in + alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) + lt_cv_deplibs_check_method=pass_all ;; +@@ -6142,7 +6142,7 @@ linux-gnuoldld* | linux-gnuaout* | linux + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-*) + version_type=linux + need_lib_prefix=no + need_version=no @@ -10296,7 +10296,7 @@ done for ac_header in \ @@ -48,6 +48,7 @@ ADK_RUNTIME_TMPFS_SIZE:= $(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE))) ADK_RUNTIME_CONSOLE_SERIAL_SPEED:= $(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED))) ADK_HOST:= $(strip $(subst ",, $(ADK_HOST))) ADK_VENDOR:= $(strip $(subst ",, $(ADK_VENDOR))) +ADK_DL_DIR:= $(strip $(subst ",, $(ADK_DL_DIR))) ADK_COMPRESSION_TOOL:= $(strip $(subst ",, $(ADK_COMPRESSION_TOOL))) ADK_TOOLS_ADDPATTERN_ARGS:= $(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS))) ADK_KERNEL_VERSION:= $(strip $(subst ",, $(ADK_KERNEL_VERSION))) diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 46de14044..7544723bf 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -12,6 +12,13 @@ config ADK_HOST help Configure host for IPKG package management. +config ADK_DL_DIR + string "download directory for packages" + default "" + help + Configure the download directory for all source packages. + Use an absolute path. + config ADK_DEBUG bool "Compile applications with debug support by default" default n |