Changeset ee613ea in freewrt

Timestamp:

Jan 6, 2007, 2:32:51 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

4e32a60

Parents:

451aa8b

Message:

implement a means for packages with no distfiles to work
instructions: use a do-extract: target (default: empty),
and set NO_DISTFILES to 1 before including package.mk

git-svn-id: ​svn://www.freewrt.org/branches/common-adk@1412 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• mk/buildhlp.mk (modified) (5 diffs)
• package/base-files/Makefile (modified) (2 diffs)

mk/buildhlp.mk

@@ -5 +5 @@
 # or at http://www.freewrt.org/license for details.
 
-ifneq (${PKG_SOURCE_URL},)
-ifeq (${PKG_SOURCE},)
+ifneq ($(strip ${PKG_SOURCE_URL}),)
+ifeq ($(strip ${PKG_SOURCE}),)
 PKG_SOURCE:=            ${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
 endif
-ifneq (${PKG_SOURCE},)
+ifneq ($(strip ${PKG_SOURCE}),)
 DISTFILES?=             ${DL_DIR}/${PKG_SOURCE}
 endif
@@ -19 +19 @@
 WRKINST?=               ${WRKDIR}/fake-${ARCH}/root
 
-ifneq (${PKG_SOURCE_URL},)
+ifneq ($(strip ${PKG_SOURCE_URL}),)
 $(DL_DIR)/$(PKG_SOURCE):
         @$(CMD_TRACE) "downloading... "
@@ -32 +32 @@
         @echo "distfiles downloaded in FreeWRT. Sorry." >&2
 
-ifneq (${DISTFILES}${PKG_SOURCE},)
+ifneq ($(strip ${DISTFILES})$(strip ${PKG_SOURCE}),)
 fetch: ${DISTFILES}
 refetch:
@@ -42 +42 @@
         rm -rf ${WRKSRC} ${WRKBUILD}
         ${EXTRACT_CMD}
-ifneq (${CRLF_WORKAROUND},)
+ifneq ($(strip ${CRLF_WORKAROUND}),)
         perl -pi -e 's!\r$$!!g' $$(find ${WRKSRC} -type f)
 endif
         touch $@
 
+__use_generic_patch_target:=42
+else
+ifeq ($(strip ${NO_DISTFILES}),1)
+${WRKBUILD}/.extract_done:
+        rm -rf ${WRKSRC} ${WRKBUILD}
+        mkdir -p ${WRKDIR} ${WRKSRC}
+        ${MAKE} do-extract
+        touch $@
+
+fetch refetch do-extract:
+
+__use_generic_patch_target:=42
+else
+ifeq ($(strip ${_IN_PACKAGE}),1)
+$(warning This package does not use the generic extraction and patch target; it's most likely to fail.)
+endif
+endif
+endif
+
+ifeq ($(strip ${__use_generic_patch_target}),42)
 ${WRKBUILD}/.prepared: ${WRKBUILD}/.extract_done
         [ ! -d ./patches ] || $(PREVENT_PATCH) $(PATCH) $(WRKSRC) ./patches \
@@ -54 +74 @@
         [ ! -d ./extra ] || (cd extra; $(PREVENT_PATCH) pax -rw . ${WRKSRC}/)
         touch $@
-else
-ifeq (${_IN_PACKAGE},1)
-$(warning This package does not use the generic extraction and patch target; it's most likely to fail.)
-endif
 endif
 

package/base-files/Makefile

@@ -12 +12 @@
 PKG_RELEASE:=           17
 WRKSRC=                 ${WRKDIR}/base-files
-
-DISTFILES:=
+NO_DISTFILES:=          1       # should be Yes, but gmake sucks
 
 include $(TOPDIR)/mk/package.mk
@@ -43 +42 @@
 endif
 
-do-configure:
-        touch ${WRKBUILD}/.prepared
 do-install:
         $(CP) ./files/* $(IDIR_BASE_FILES)