From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 02:16:37 +0000
Subject: build system cleanup. move shared include files into
 $(TOPDIR)/include, move lzma, mkfs.* into toolchain/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 300 insertions(+)
 create mode 100644 include/package.mk

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
new file mode 100644
index 000000000..82298b024
--- /dev/null
+++ b/include/package.mk
@@ -0,0 +1,300 @@
+ifneq ($(DUMP),)
+  all: dumpinfo
+else
+  all: compile
+endif
+
+define Build/DefaultTargets
+  ifeq ($(DUMP),)
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR))
+      ifeq ($(CONFIG_AUTOREBUILD),y)
+        $(PKG_BUILD_DIR)/.prepared: package-clean
+      endif
+    endif
+
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+      ifeq ($(CONFIG_AUTOREBUILD),y)
+        $(PKG_BUILD_DIR)/.built: package-rebuild
+      endif
+    endif
+  endif
+
+
+  $(PKG_BUILD_DIR)/.prepared:
+	@-rm -rf $(PKG_BUILD_DIR)
+	@mkdir -p $(PKG_BUILD_DIR)
+	$(call Build/Prepare)
+	touch $$@
+
+  $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	$(call Build/Configure)
+	touch $$@
+
+  $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+	$(call Build/Compile)
+	touch $$@
+
+  $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
+	$(call Build/InstallDev)
+	touch $$@
+	
+  ifdef Build/InstallDev
+    compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+  endif
+
+  package-clean: FORCE
+	$(call Build/Clean)
+	$(call Build/UninstallDev)
+	rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+
+  package-rebuild: FORCE
+	@-rm -f $(PKG_BUILD_DIR)/.built
+
+  define Build/DefaultTargets
+  endef
+endef
+
+define Package/Default
+  CONFIGFILE:=
+  SECTION:=opt
+  CATEGORY:=Extra packages
+  DEPENDS:=
+  MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
+  SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
+  ifneq ($(PKG_VERSION),)
+    ifneq ($(PKG_RELEASE),)
+      VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+    else
+      VERSION:=$(PKG_VERSION)
+    endif
+  else
+    VERSION:=$(PKG_RELEASE)
+  endif
+  PKGARCH:=$(ARCH)
+  PRIORITY:=optional
+  DEFAULT:=
+  MENU:=
+  TITLE:=
+  DESCRIPTION:=
+endef
+
+define BuildIPKGVariable
+pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
+export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
+$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi;
+endef
+
+define BuildPackage
+  $(eval $(call Package/Default))
+  $(eval $(call Package/$(1)))
+
+  $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION,
+    ifeq ($($(FIELD)),)
+      $$(error Package/$(1) is missing the $(FIELD) field)
+    endif
+  )
+
+  ifeq ($(PKGARCH),)
+    PKGARCH:=$(ARCH)
+  endif
+
+  ifeq ($(DESCRIPTION),)
+    $(eval DESCRIPTION:=$(TITLE))
+  endif
+
+  IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
+  IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
+  INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
+
+  ifeq ($(CONFIG_PACKAGE_$(1)),y)
+    install-targets: $$(INFO_$(1))
+  endif
+
+  ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+    compile-targets: $$(IPKG_$(1))
+  endif
+
+  IDEPEND_$(1):=$$(strip $$(DEPENDS))
+
+  DUMPINFO += \
+	echo "Package: $(1)"; 
+
+  ifneq ($(MENU),)
+    DUMPINFO += \
+	echo "Menu: $(MENU)";
+  endif
+
+  ifneq ($(DEFAULT),)
+    DUMPINFO += \
+	echo "Default: $(DEFAULT)";
+  endif
+
+  DUMPINFO += \
+	echo "Version: $(VERSION)"; \
+	echo "Depends: $$(IDEPEND_$(1))"; \
+	echo "Build-Depends: $(PKG_BUILDDEP)"; \
+	echo "Category: $(CATEGORY)"; \
+	echo "Title: $(TITLE)"; \
+	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
+
+  ifneq ($(URL),)
+    DUMPINFO += \
+	echo; \
+	echo "$(URL)";
+  endif
+
+  DUMPINFO += \
+	echo "@@";
+
+  ifneq ($(CONFIG),)
+    DUMPINFO += \
+	echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \
+	echo "@@";
+  endif
+
+  $(eval $(call BuildIPKGVariable,$(1),conffiles))
+  $(eval $(call BuildIPKGVariable,$(1),preinst))
+  $(eval $(call BuildIPKGVariable,$(1),postinst))
+  $(eval $(call BuildIPKGVariable,$(1),prerm))
+  $(eval $(call BuildIPKGVariable,$(1),postrm))
+  $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
+	mkdir -p $$(IDIR_$(1))/CONTROL
+	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
+	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
+	( \
+		DEPENDS=; \
+		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
+			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
+		done; \
+		echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
+	)
+	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
+	chmod 644 $$(IDIR_$(1))/CONTROL/control
+	(cd $$(IDIR_$(1))/CONTROL; \
+		$($(1)_COMMANDS) \
+	)
+
+  $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
+	$(call Package/$(1)/install,$$(IDIR_$(1)))
+	mkdir -p $(PACKAGE_DIR)
+	-find $$(IDIR_$(1)) -name CVS | xargs rm -rf
+	-find $$(IDIR_$(1)) -name .svn | xargs rm -rf
+	-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
+	$(RSTRIP) $$(IDIR_$(1))
+	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+
+  $$(INFO_$(1)): $$(IPKG_$(1))
+	$(IPKG) install $$(IPKG_$(1))
+
+  $(1)-clean:
+	rm -f $(PACKAGE_DIR)/$(1)_*
+
+  clean: $(1)-clean
+
+  $$(eval $$(call Build/DefaultTargets,$(1)))
+
+endef
+
+ifneq ($(strip $(PKG_CAT)),)
+  define Build/Prepare/Default
+	@if [ "$(PKG_CAT)" = "unzip" ]; then \
+		unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
+	else \
+		$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
+	fi						  
+	@if [ -d ./patches ]; then \
+		$(PATCH) $(PKG_BUILD_DIR) ./patches ; \
+	fi
+  endef
+endif
+
+define Build/Prepare
+  $(call Build/Prepare/Default)
+endef
+
+define Build/Configure/Default
+	@(cd $(PKG_BUILD_DIR)/$(3); \
+	[ -x configure ] && \
+		$(2) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--program-prefix="" \
+		--program-suffix="" \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		$(DISABLE_NLS) \
+		$(1); \
+		true; \
+	)
+endef
+
+define Build/Configure
+  $(call Build/Configure/Default,)
+endef
+
+define Build/Compile/Default
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CC=$(TARGET_CC) \
+		CROSS="$(TARGET_CROSS)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
+		ARCH="$(ARCH)" \
+		$(1);
+endef
+
+define Build/Compile
+  $(call Build/Compile/Default,)
+endef
+
+ifneq ($(DUMP),)
+  dumpinfo: FORCE
+	@$(DUMPINFO)
+else
+  $(PACKAGE_DIR):
+	mkdir -p $@
+		
+  ifneq ($(strip $(PKG_SOURCE)),)
+    source: $(DL_DIR)/$(PKG_SOURCE)
+
+    $(DL_DIR)/$(PKG_SOURCE):
+		mkdir -p $(DL_DIR)
+		$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
+
+    $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
+  endif
+
+  source:
+  prepare: $(PKG_BUILD_DIR)/.prepared
+  configure: $(PKG_BUILD_DIR)/.configured
+
+  compile-targets:
+  compile: compile-targets
+
+  install-targets:
+  install: install-targets
+
+  clean-targets:
+  clean: FORCE
+	@$(MAKE) clean-targets
+	$(call Build/Clean)
+	rm -rf $(PKG_BUILD_DIR)
+endif
-- 
cgit v1.2.3


From 94266d638908a140ef5cdd9b27d2eb367f97249f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 06:19:43 +0000
Subject: massive cleanup of toolchain/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4038 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 82298b024..9b863074f 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -201,14 +201,15 @@ define BuildPackage
 endef
 
 ifneq ($(strip $(PKG_CAT)),)
+  ifeq ($(PKG_CAT),unzip)
+    UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE)
+  else
+    UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) -
+  endif
   define Build/Prepare/Default
-	@if [ "$(PKG_CAT)" = "unzip" ]; then \
-		unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \
-	else \
-		$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \
-	fi						  
+  	$(UNPACK)
 	@if [ -d ./patches ]; then \
-		$(PATCH) $(PKG_BUILD_DIR) ./patches ; \
+		$(PATCH) $(PKG_BUILD_DIR) ./patches; \
 	fi
   endef
 endif
-- 
cgit v1.2.3


From c32af7bf6caa056f0026216645ec1a99d8dcf4bb Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 22 Jun 2006 01:00:13 +0000
Subject: remove stale reference to package/rules.mk - not that useful in the
 dependency handling anyway

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4049 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 9b863074f..cf8756ea6 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -6,7 +6,7 @@ endif
 
 define Build/DefaultTargets
   ifeq ($(DUMP),)
-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR))
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
       ifeq ($(CONFIG_AUTOREBUILD),y)
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
-- 
cgit v1.2.3


From 5bd73a12052f8e9182ac1f51372cf6d0323f9dad Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 25 Jun 2006 16:05:43 +0000
Subject: move the broadcom driver stuff into its own submenu

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4073 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index cf8756ea6..0996574d2 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -74,6 +74,7 @@ define Package/Default
   PRIORITY:=optional
   DEFAULT:=
   MENU:=
+  SUBMENU:=
   TITLE:=
   DESCRIPTION:=
 endef
@@ -124,6 +125,11 @@ define BuildPackage
 	echo "Menu: $(MENU)";
   endif
 
+  ifneq ($(SUBMENU),)
+    DUMPINFO += \
+	echo "Submenu: $(SUBMENU)";
+  endif
+
   ifneq ($(DEFAULT),)
     DUMPINFO += \
 	echo "Default: $(DEFAULT)";
-- 
cgit v1.2.3


From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Jun 2006 00:35:46 +0000
Subject: credit where credit is due

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 0996574d2..bf2376dcd 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 ifneq ($(DUMP),)
   all: dumpinfo
 else
-- 
cgit v1.2.3


From e9437d222f86a8960af081199fbef41312c7770b Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Jul 2006 21:17:45 +0000
Subject: add a new FORCEREBUILD option to Package/<name> to force a package to
 be rebuilt each time make is run

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4123 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index bf2376dcd..618c3c555 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -121,6 +121,10 @@ define BuildPackage
     compile-targets: $$(IPKG_$(1))
   endif
 
+  ifeq ($(FORCEREBUILD),y)
+    $$(IPKG_$(1)): FORCE
+  endif
+
   IDEPEND_$(1):=$$(strip $$(DEPENDS))
 
   DUMPINFO += \
-- 
cgit v1.2.3


From e7359513bec031e2a0d5c38fa8e9b5fd3cd2ab40 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 10 Jul 2006 23:21:08 +0000
Subject: rebuild ipkg control files if Makefile changes

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4124 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 618c3c555..7aea314ab 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -173,7 +173,7 @@ define BuildPackage
   $(eval $(call BuildIPKGVariable,$(1),postinst))
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
-  $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
+  $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
-- 
cgit v1.2.3


From 1f181fae00a9879130ce21ee28c3035773aba744 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 18 Jul 2006 15:31:01 +0000
Subject: check if the Package/$(NAME) template is defined before packaging or
 installing ipkg packages

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4144 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 7aea314ab..2784cc888 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -65,6 +65,7 @@ define Package/Default
   SECTION:=opt
   CATEGORY:=Extra packages
   DEPENDS:=
+  EXTRA_DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
   SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
   ifneq ($(PKG_VERSION),)
@@ -113,12 +114,14 @@ define BuildPackage
   IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
   INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
-  ifeq ($(CONFIG_PACKAGE_$(1)),y)
-    install-targets: $$(INFO_$(1))
-  endif
+  ifdef Package/$(1)/install
+    ifeq ($(CONFIG_PACKAGE_$(1)),y)
+      install-targets: $$(INFO_$(1))
+    endif
 
-  ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
-    compile-targets: $$(IPKG_$(1))
+    ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+      compile-targets: $$(IPKG_$(1))
+    endif
   endif
 
   ifeq ($(FORCEREBUILD),y)
@@ -182,7 +185,7 @@ define BuildPackage
 		for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
 			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
 		done; \
-		echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
+		echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \
 	)
 	echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
-- 
cgit v1.2.3


From 30010567953c3acfa28c2beafe50e6177254eefa Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 18 Jul 2006 20:17:05 +0000
Subject: make the buildroot-ng sdk compatible with the old packages

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4158 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 2784cc888..ce07640ee 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -41,6 +41,7 @@ define Build/DefaultTargets
 	touch $$@
 
   $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/stampfiles
 	$(call Build/InstallDev)
 	touch $$@
 	
-- 
cgit v1.2.3


From 121ce3b367ebfcd69d04a2d90d85b7df0d5233ca Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 20 Jul 2006 17:28:05 +0000
Subject: change 'source' to 'download'

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4176 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index ce07640ee..38fd93df7 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -294,7 +294,7 @@ else
 	mkdir -p $@
 		
   ifneq ($(strip $(PKG_SOURCE)),)
-    source: $(DL_DIR)/$(PKG_SOURCE)
+    download: $(DL_DIR)/$(PKG_SOURCE)
 
     $(DL_DIR)/$(PKG_SOURCE):
 		mkdir -p $(DL_DIR)
@@ -303,7 +303,7 @@ else
     $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
   endif
 
-  source:
+  download:
   prepare: $(PKG_BUILD_DIR)/.prepared
   configure: $(PKG_BUILD_DIR)/.configured
 
-- 
cgit v1.2.3


From 8b0bcee75e4e1300cdcb7dbf0f60989f84e31cd2 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 21 Jul 2006 14:27:45 +0000
Subject: add submenu dependencies (used to hide the proprietary broadcom
 driver on anything except for brcm-2.4)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4197 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 38fd93df7..757c8396a 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -83,6 +83,7 @@ define Package/Default
   DEFAULT:=
   MENU:=
   SUBMENU:=
+  SUBMENUDEP:=
   TITLE:=
   DESCRIPTION:=
 endef
@@ -142,6 +143,10 @@ define BuildPackage
   ifneq ($(SUBMENU),)
     DUMPINFO += \
 	echo "Submenu: $(SUBMENU)";
+    ifneq ($(SUBMENUDEP),)
+      DUMPINFO += \
+	  echo "Submenu-Depends: $(SUBMENUDEP)";
+    endif
   endif
 
   ifneq ($(DEFAULT),)
-- 
cgit v1.2.3


From b1b9e3fadc4d2575d7846c202e93bbdefd55d6a1 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 26 Jul 2006 01:01:09 +0000
Subject: add more ipkg validation checks

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4292 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 757c8396a..7af742039 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -12,14 +12,12 @@ endif
 
 define Build/DefaultTargets
   ifeq ($(DUMP),)
-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-      ifeq ($(CONFIG_AUTOREBUILD),y)
+    ifeq ($(CONFIG_AUTOREBUILD),y)
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
-    endif
 
-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
-      ifeq ($(CONFIG_AUTOREBUILD),y)
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif
@@ -182,7 +180,7 @@ define BuildPackage
   $(eval $(call BuildIPKGVariable,$(1),postinst))
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
-  $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared
+  $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@@ -212,6 +210,7 @@ define BuildPackage
 	-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
+	@[ -f $$(IPKG_$(1)) ] || false 
 
   $$(INFO_$(1)): $$(IPKG_$(1))
 	$(IPKG) install $$(IPKG_$(1))
@@ -221,6 +220,10 @@ define BuildPackage
 
   clean: $(1)-clean
 
+  $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH):
+	-rm $(PKG_BUILD_DIR)/.version-$(1)_*
+	@touch $$@
+
   $$(eval $$(call Build/DefaultTargets,$(1)))
 
 endef
-- 
cgit v1.2.3


From 3f07a6aa051a0413da8796389a62574955d15982 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 28 Jul 2006 17:53:19 +0000
Subject: fix build issues with SMP compiles

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4317 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 7af742039..e0765f7ba 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -220,7 +220,7 @@ define BuildPackage
 
   clean: $(1)-clean
 
-  $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH):
+  $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
 	-rm $(PKG_BUILD_DIR)/.version-$(1)_*
 	@touch $$@
 
-- 
cgit v1.2.3


From 432ce85854aea17f9383519db1c2d3a8307c0760 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 29 Jul 2006 11:30:06 +0000
Subject: add support for per-package prereq checks, run global prereq checks
 before (menu-)config

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4318 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index e0765f7ba..cd1a33c48 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -10,6 +10,8 @@ else
   all: compile
 endif
 
+include $(INCLUDE_DIR)/prereq.mk
+
 define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
-- 
cgit v1.2.3


From 0301816e6adecb7048afbd6ced732f48ff2ca46f Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 2 Aug 2006 12:07:14 +0000
Subject: minor makefile tweaks

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4393 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 57 +++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index cd1a33c48..3dc944dbf 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -40,19 +40,19 @@ define Build/DefaultTargets
 	$(call Build/Compile)
 	touch $$@
 
-  $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
+  ifdef Build/InstallDev
+    $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/stampfiles
 	$(call Build/InstallDev)
 	touch $$@
 	
-  ifdef Build/InstallDev
     compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
   endif
 
   package-clean: FORCE
 	$(call Build/Clean)
 	$(call Build/UninstallDev)
-	rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
+	-rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
 
   package-rebuild: FORCE
 	@-rm -f $(PKG_BUILD_DIR)/.built
@@ -89,9 +89,9 @@ define Package/Default
 endef
 
 define BuildIPKGVariable
-pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
-export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
-$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi;
+  pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
+  export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
+  $(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi;
 endef
 
 define BuildPackage
@@ -132,29 +132,30 @@ define BuildPackage
 
   IDEPEND_$(1):=$$(strip $$(DEPENDS))
 
-  DUMPINFO += \
+  ifneq ($(DUMP),)
+    DUMPINFO += \
 	echo "Package: $(1)"; 
 
-  ifneq ($(MENU),)
-    DUMPINFO += \
+    ifneq ($(MENU),)
+      DUMPINFO += \
 	echo "Menu: $(MENU)";
-  endif
+    endif
 
-  ifneq ($(SUBMENU),)
-    DUMPINFO += \
-	echo "Submenu: $(SUBMENU)";
-    ifneq ($(SUBMENUDEP),)
+    ifneq ($(SUBMENU),)
       DUMPINFO += \
+	echo "Submenu: $(SUBMENU)";
+      ifneq ($(SUBMENUDEP),)
+        DUMPINFO += \
 	  echo "Submenu-Depends: $(SUBMENUDEP)";
+      endif
     endif
-  endif
 
-  ifneq ($(DEFAULT),)
-    DUMPINFO += \
+    ifneq ($(DEFAULT),)
+      DUMPINFO += \
 	echo "Default: $(DEFAULT)";
-  endif
+    endif
 
-  DUMPINFO += \
+    DUMPINFO += \
 	echo "Version: $(VERSION)"; \
 	echo "Depends: $$(IDEPEND_$(1))"; \
 	echo "Build-Depends: $(PKG_BUILDDEP)"; \
@@ -162,19 +163,20 @@ define BuildPackage
 	echo "Title: $(TITLE)"; \
 	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
 
-  ifneq ($(URL),)
-    DUMPINFO += \
+    ifneq ($(URL),)
+      DUMPINFO += \
 	echo; \
 	echo "$(URL)";
-  endif
+    endif
 
-  DUMPINFO += \
+    DUMPINFO += \
 	echo "@@";
 
-  ifneq ($(CONFIG),)
-    DUMPINFO += \
+    ifneq ($(CONFIG),)
+      DUMPINFO += \
 	echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \
 	echo "@@";
+    endif
   endif
 
   $(eval $(call BuildIPKGVariable,$(1),conffiles))
@@ -182,7 +184,7 @@ define BuildPackage
   $(eval $(call BuildIPKGVariable,$(1),postinst))
   $(eval $(call BuildIPKGVariable,$(1),prerm))
   $(eval $(call BuildIPKGVariable,$(1),postrm))
-  $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
+  $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
 	mkdir -p $$(IDIR_$(1))/CONTROL
 	echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
 	echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
@@ -204,7 +206,7 @@ define BuildPackage
 		$($(1)_COMMANDS) \
 	)
 
-  $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
+  $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
 	-find $$(IDIR_$(1)) -name CVS | xargs rm -rf
@@ -227,7 +229,6 @@ define BuildPackage
 	@touch $$@
 
   $$(eval $$(call Build/DefaultTargets,$(1)))
-
 endef
 
 ifneq ($(strip $(PKG_CAT)),)
-- 
cgit v1.2.3


From abbc6440741e747eb56f5b03d3df26df5e536864 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 2 Aug 2006 13:40:11 +0000
Subject: fix CONFIG_ALL

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4397 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 3dc944dbf..fbd4cf714 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -19,7 +19,7 @@ define Build/DefaultTargets
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
 
-      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/check_$(1)),$(IPKG_$(1)))
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif
@@ -121,7 +121,7 @@ define BuildPackage
       install-targets: $$(INFO_$(1))
     endif
 
-    ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),)
+    ifneq ($(CONFIG_PACKAGE_$(1))$(CONFIG_ALL),)
       compile-targets: $$(IPKG_$(1))
     endif
   endif
-- 
cgit v1.2.3


From d8ced17f8b4963015c43b0084650231bef7bb565 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 2 Aug 2006 13:57:33 +0000
Subject: correct [4397]

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4398 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index fbd4cf714..b4b6538b6 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -121,7 +121,7 @@ define BuildPackage
       install-targets: $$(INFO_$(1))
     endif
 
-    ifneq ($(CONFIG_PACKAGE_$(1))$(CONFIG_ALL),)
+    ifneq ($(CONFIG_PACKAGE_$(1)),)
       compile-targets: $$(IPKG_$(1))
     endif
   endif
-- 
cgit v1.2.3


From 65d0d163368643d566dceff9398d42653d51aecf Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 2 Aug 2006 14:34:35 +0000
Subject: remove debug line

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4400 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index b4b6538b6..c0953ae70 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -19,13 +19,12 @@ define Build/DefaultTargets
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
 
-      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/check_$(1)),$(IPKG_$(1)))
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif
   endif
 
-
   $(PKG_BUILD_DIR)/.prepared:
 	@-rm -rf $(PKG_BUILD_DIR)
 	@mkdir -p $(PKG_BUILD_DIR)
-- 
cgit v1.2.3


From 001227b7800328fe3db15d62e0948d25dfa596f6 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Aug 2006 05:30:27 +0000
Subject: more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4432 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index c0953ae70..fee715043 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -285,7 +285,6 @@ endef
 define Build/Compile/Default
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC=$(TARGET_CC) \
 		CROSS="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
 		ARCH="$(ARCH)" \
-- 
cgit v1.2.3


From 5d099491cf5469749a3961291b621429aeee0070 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Aug 2006 09:14:20 +0000
Subject: fix everything I broke with the previous patches

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4436 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index fee715043..79c29bccf 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -283,7 +283,7 @@ define Build/Configure
 endef
 
 define Build/Compile/Default
-	$(MAKE) -C $(PKG_BUILD_DIR) \
+	PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CROSS="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
-- 
cgit v1.2.3


From ef998d64e381ed0a92fc73edf4206f7be7335caf Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Aug 2006 11:59:52 +0000
Subject: set PATH in rules.mk

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 79c29bccf..385a84653 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -251,11 +251,11 @@ endef
 define Build/Configure/Default
 	@(cd $(PKG_BUILD_DIR)/$(3); \
 	[ -x configure ] && \
-		$(2) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		$(2) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -283,7 +283,7 @@ define Build/Configure
 endef
 
 define Build/Compile/Default
-	PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CROSS="$(TARGET_CROSS)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
-- 
cgit v1.2.3


From c6753b594214c24fa26458539a74e82aa75e053e Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 16 Aug 2006 23:43:56 +0000
Subject: Show error messages when collecting the package info

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4573 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 385a84653..43f175890 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,10 +16,12 @@ define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
+	$$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
 
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
+	$$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1))))
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif
-- 
cgit v1.2.3


From ba906d9e770b2bbd5a074195568e357ac7122d55 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 17 Aug 2006 00:12:03 +0000
Subject: fix accidental tab

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4577 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 43f175890..0847528b7 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,12 +16,12 @@ define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-	$$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)))
+        $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
 
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
-	$$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1))))
+        $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1))))
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
     endif
-- 
cgit v1.2.3


From 282f9ebaca8fb2e095105f213a4b5a89a497cad0 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 17 Aug 2006 00:33:27 +0000
Subject: tidy up output

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4578 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 0847528b7..332833272 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -15,15 +15,20 @@ include $(INCLUDE_DIR)/prereq.mk
 define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
+      _INFO:=
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-        $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)))
+	_INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
 
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
-        $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1))))
+        _INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1)))
         $(PKG_BUILD_DIR)/.built: package-rebuild
       endif
+
+      ifneq ($(MAKECMDGOALS),prereq)
+        $$(info Rebuilding $$(_INFO))
+      endif
     endif
   endif
 
-- 
cgit v1.2.3


From 91637acf54cc52ec9c03cbd195af08e9ae8e0739 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Aug 2006 09:57:57 +0000
Subject: Add new warning to help track down pesky compile issues

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4713 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 332833272..311ec35a9 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -27,7 +27,9 @@ define Build/DefaultTargets
       endif
 
       ifneq ($(MAKECMDGOALS),prereq)
-        $$(info Rebuilding $$(_INFO))
+        ifneq ($$(_INFO),)
+          $$(info Rebuilding $$(_INFO))
+        endif
       endif
     endif
   endif
@@ -129,6 +131,10 @@ define BuildPackage
 
     ifneq ($(CONFIG_PACKAGE_$(1)),)
       compile-targets: $$(IPKG_$(1))
+    else
+      compile-targets: $(1)-disabled
+      $(1)-disabled:
+	@echo "WARNING: skipping $(1) -- package not selected"
     endif
   endif
 
-- 
cgit v1.2.3


From eac6330602f08ef254803e17c7bde2ed22f5c7b8 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Aug 2006 10:24:11 +0000
Subject: only run trap error code in the configure template, if the configure
 script was not found

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4715 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 311ec35a9..ce3c4b6a1 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -263,7 +263,7 @@ endef
 
 define Build/Configure/Default
 	@(cd $(PKG_BUILD_DIR)/$(3); \
-	[ -x configure ] && \
+	[ -x configure ] && { \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -287,7 +287,7 @@ define Build/Configure/Default
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 		$(1); \
-		true; \
+	} || true; \
 	)
 endef
 
-- 
cgit v1.2.3


From c9b650c269c7dcc5383b4b614ccfe80fbaf6576c Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Aug 2006 10:26:30 +0000
Subject: fix previous commit

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4716 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index ce3c4b6a1..8d9050930 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -237,7 +237,7 @@ define BuildPackage
   clean: $(1)-clean
 
   $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
-	-rm $(PKG_BUILD_DIR)/.version-$(1)_*
+	-@rm $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
 	@touch $$@
 
   $$(eval $$(call Build/DefaultTargets,$(1)))
@@ -263,7 +263,7 @@ endef
 
 define Build/Configure/Default
 	@(cd $(PKG_BUILD_DIR)/$(3); \
-	[ -x configure ] && { \
+	[ \! -x configure ] || \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -287,7 +287,6 @@ define Build/Configure/Default
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 		$(1); \
-	} || true; \
 	)
 endef
 
-- 
cgit v1.2.3


From 21842638d0b7851f376ae51b08904d2b1a48d6ca Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Aug 2006 10:30:14 +0000
Subject: use an if block on the whole configure command

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4717 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 8d9050930..9a947f358 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -263,7 +263,7 @@ endef
 
 define Build/Configure/Default
 	@(cd $(PKG_BUILD_DIR)/$(3); \
-	[ \! -x configure ] || \
+	if [ -x configure ]; then \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
@@ -287,6 +287,7 @@ define Build/Configure/Default
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
 		$(1); \
+	fi; \
 	)
 endef
 
-- 
cgit v1.2.3


From 57127d8916fee08e09cc95256eaf5f53d4b1ba2b Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Sep 2006 12:14:08 +0000
Subject: fix unnecessary rebuilds for library package directories with no
 selected packages

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4767 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 9a947f358..515698d69 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -17,20 +17,10 @@ define Build/DefaultTargets
     ifeq ($(CONFIG_AUTOREBUILD),y)
       _INFO:=
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-	_INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
+        _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
 
-      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
-        _INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1)))
-        $(PKG_BUILD_DIR)/.built: package-rebuild
-      endif
-
-      ifneq ($(MAKECMDGOALS),prereq)
-        ifneq ($$(_INFO),)
-          $$(info Rebuilding $$(_INFO))
-        endif
-      endif
     endif
   endif
 
@@ -241,6 +231,19 @@ define BuildPackage
 	@touch $$@
 
   $$(eval $$(call Build/DefaultTargets,$(1)))
+
+  ifneq ($$(CONFIG_PACKAGE_$(1)),)
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1)))
+      _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
+      $(PKG_BUILD_DIR)/.built: package-rebuild
+    endif
+
+    ifneq ($(MAKECMDGOALS),prereq)
+      ifneq ($$(_INFO),)
+        $$(info Rebuilding $$(_INFO))
+      endif
+    endif
+  endif
 endef
 
 ifneq ($(strip $(PKG_CAT)),)
-- 
cgit v1.2.3


From de399b7bdfd5bf4756bd98c156506d11cbb01714 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Sep 2006 12:48:22 +0000
Subject: add extra rebuild check for development libraries

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4770 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 515698d69..42ffcfbb3 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -39,6 +39,10 @@ define Build/DefaultTargets
 	touch $$@
 
   ifdef Build/InstallDev
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed)
+      $(PKG_BUILD_DIR)/.built: package-rebuild
+    endif
+
     $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/stampfiles
 	$(call Build/InstallDev)
-- 
cgit v1.2.3


From 82453564bc58c7e9be8c0a5e9d64ec1ad7297d8c Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Sep 2006 16:48:03 +0000
Subject: don't run rebuild checks for dump and prereq

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4771 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 42ffcfbb3..bea042812 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -237,14 +237,16 @@ define BuildPackage
   $$(eval $$(call Build/DefaultTargets,$(1)))
 
   ifneq ($$(CONFIG_PACKAGE_$(1)),)
-    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1)))
-      _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
-      $(PKG_BUILD_DIR)/.built: package-rebuild
-    endif
-
     ifneq ($(MAKECMDGOALS),prereq)
-      ifneq ($$(_INFO),)
-        $$(info Rebuilding $$(_INFO))
+      ifneq ($(DUMP),1)
+        ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1)))
+          _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
+          $(PKG_BUILD_DIR)/.built: package-rebuild
+        endif
+
+        ifneq ($$(_INFO),)
+          $$(info Rebuilding $$(_INFO))
+        endif
       endif
     endif
   endif
-- 
cgit v1.2.3


From 722a23d418f716ce4b9d554add3143c6c81e1548 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 7 Sep 2006 16:50:27 +0000
Subject: add quotes to ipkg name in the rebuild check

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4772 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index bea042812..ef1fc48ec 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -239,7 +239,7 @@ define BuildPackage
   ifneq ($$(CONFIG_PACKAGE_$(1)),)
     ifneq ($(MAKECMDGOALS),prereq)
       ifneq ($(DUMP),1)
-        ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1)))
+        ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
           _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
           $(PKG_BUILD_DIR)/.built: package-rebuild
         endif
-- 
cgit v1.2.3


From 3399aaf35ee37df541d40aeb3a360e82341de44f Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 18 Sep 2006 21:56:07 +0000
Subject: correct arguments to Build/Prepare/Default

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4802 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index ef1fc48ec..396fae60f 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -267,7 +267,7 @@ ifneq ($(strip $(PKG_CAT)),)
 endif
 
 define Build/Prepare
-  $(call Build/Prepare/Default)
+  $(call Build/Prepare/Default,)
 endef
 
 define Build/Configure/Default
-- 
cgit v1.2.3


From aafb639ffe5e68e42244b36361fbc2434ea1ce27 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 24 Sep 2006 02:09:45 +0000
Subject: add CXXFLAGS and PKG_CONFIG_PATH in Build/Configure/Default, add
 EXTRA_LDFLAGS in Build/Compile/Default, use consistent search order for
 includes in CFLAGS.

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4849 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 396fae60f..f7dbacc41 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -271,12 +271,14 @@ define Build/Prepare
 endef
 
 define Build/Configure/Default
-	@(cd $(PKG_BUILD_DIR)/$(3); \
+	(cd $(PKG_BUILD_DIR)/$(3); \
 	if [ -x configure ]; then \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		CXXFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
 		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		$(2) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
@@ -308,7 +310,8 @@ define Build/Compile/Default
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CROSS="$(TARGET_CROSS)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \
+		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
 		ARCH="$(ARCH)" \
 		$(1);
 endef
-- 
cgit v1.2.3


From ba4845f765e7dd3db0f7bc2aa87ebed4db051cee Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 24 Sep 2006 21:17:17 +0000
Subject: fix DESCRIPTION use in menuconfig and ipkg control files

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4856 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index f7dbacc41..709bb4415 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -90,6 +90,14 @@ define Package/Default
   DESCRIPTION:=
 endef
 
+define BuildDescription
+  ifneq ($(DESCRIPTION),)
+    DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION)
+  else
+    DESCRIPTION:=$(TITLE)
+  endif
+endef
+
 define BuildIPKGVariable
   pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
   export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
@@ -99,21 +107,14 @@ endef
 define BuildPackage
   $(eval $(call Package/Default))
   $(eval $(call Package/$(1)))
+  $(eval $(call BuildDescription))
 
-  $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION,
+  $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
     ifeq ($($(FIELD)),)
       $$(error Package/$(1) is missing the $(FIELD) field)
     endif
   )
 
-  ifeq ($(PKGARCH),)
-    PKGARCH:=$(ARCH)
-  endif
-
-  ifeq ($(DESCRIPTION),)
-    $(eval DESCRIPTION:=$(TITLE))
-  endif
-
   IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
   IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
   INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
@@ -206,7 +207,7 @@ define BuildPackage
 	echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
 	echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
-	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control
+	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g' | sed -e 's,^[[:space:]]*$$$$, .,g' >> $$(IDIR_$(1))/CONTROL/control
 	chmod 644 $$(IDIR_$(1))/CONTROL/control
 	(cd $$(IDIR_$(1))/CONTROL; \
 		$($(1)_COMMANDS) \
-- 
cgit v1.2.3


From cf807efd13ca47672871d0c50d23274fe34c3114 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 5 Oct 2006 12:39:52 +0000
Subject: speed up package prereq check (only run make on those directories
 that actually contain prereq checks)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4927 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 709bb4415..3f2f7d41b 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -163,13 +163,14 @@ define BuildPackage
     endif
 
     DUMPINFO += \
+	if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \
 	echo "Version: $(VERSION)"; \
 	echo "Depends: $$(IDEPEND_$(1))"; \
 	echo "Build-Depends: $(PKG_BUILDDEP)"; \
 	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
 	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
-
+	
     ifneq ($(URL),)
       DUMPINFO += \
 	echo; \
-- 
cgit v1.2.3


From 60c107b531e09536b4f5b728a0e394da0720d0ba Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 8 Oct 2006 02:35:10 +0000
Subject: fix unnecessary package rebuild

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4954 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 3f2f7d41b..069e28b84 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,11 +16,10 @@ define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       _INFO:=
-      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
+      ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
         _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
-
     endif
   endif
 
-- 
cgit v1.2.3


From bd97e26b6af3a3e3571b0e7164ab46380b8a03e6 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Oct 2006 13:41:00 +0000
Subject: put LINUX_KARCH in .kernel.mk

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5013 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 069e28b84..e93192413 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -16,7 +16,7 @@ define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
       _INFO:=
-      ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
         _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
-- 
cgit v1.2.3


From 34dbf787c3fa13541abc9aadcf53c23016895382 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Oct 2006 15:30:50 +0000
Subject: add support for a common shell include file, which is evaluated for
 every make shell call, simplify variable passing to the shell with shvar and
 shexport templates, use Package/<pkgname>/config for adding config.in data

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5014 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index e93192413..181ea32b6 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -12,6 +12,15 @@ endif
 
 include $(INCLUDE_DIR)/prereq.mk
 
+define shvar
+V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+endef
+
+define shexport
+$(call shvar,$(1))=$$(call $(1))
+export $(call shvar,$(1))
+endef
+
 define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
@@ -98,9 +107,8 @@ define BuildDescription
 endef
 
 define BuildIPKGVariable
-  pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2))
-  export pkg_$(subst .,_,$(subst -,_,$(1))_$(2))
-  $(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi;
+  $(call shexport,Package/$(1)/$(2))
+  $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
 endef
 
 define BuildPackage
@@ -168,22 +176,22 @@ define BuildPackage
 	echo "Build-Depends: $(PKG_BUILDDEP)"; \
 	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
-	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g';
+	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
 	
     ifneq ($(URL),)
       DUMPINFO += \
-	echo; \
-	echo "$(URL)";
-    endif
-
-    DUMPINFO += \
-	echo "@@";
-
-    ifneq ($(CONFIG),)
-      DUMPINFO += \
-	echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \
-	echo "@@";
+		echo; \
+		echo "$(URL)";
     endif
+	
+	DUMPINFO += \
+		echo "@@";
+
+	$(call shexport,Package/$(1)/config)
+	DUMPINFO += \
+		if isset $(call shvar,Package/$(1)/config); then echo "Config: "; getvar $(call shvar,Package/$(1)/config); fi; \
+		echo "@@";
+  
   endif
 
   $(eval $(call BuildIPKGVariable,$(1),conffiles))
-- 
cgit v1.2.3


From 9ef909243235306a47edba82e852211ff6a40853 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Oct 2006 15:45:36 +0000
Subject: add support for Package/<pkgname>/description - old format still
 supported, but deprecated

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5015 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 181ea32b6..7ae95f8fe 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -169,6 +169,8 @@ define BuildPackage
 	echo "Default: $(DEFAULT)";
     endif
 
+	$(call shexport,Package/$(1)/description)
+
     DUMPINFO += \
 	if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \
 	echo "Version: $(VERSION)"; \
@@ -176,7 +178,12 @@ define BuildPackage
 	echo "Build-Depends: $(PKG_BUILDDEP)"; \
 	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
-	echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+	if isset $(call shvar,Package/$(1)/description); then \
+		echo -n "Description: "; \
+		getvar $(call shvar,Package/$(1)/description); \
+	else \
+		echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \
+	fi;
 	
     ifneq ($(URL),)
       DUMPINFO += \
-- 
cgit v1.2.3


From 711eed53f9d5432ac4b486b7a75ab64a5d29654f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Oct 2006 21:22:35 +0000
Subject: don't include host.mk from rules.mk - confuses package dump

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5038 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/package.mk')

diff --git a/include/package.mk b/include/package.mk
index 7ae95f8fe..5a9ba861a 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -11,6 +11,7 @@ else
 endif
 
 include $(INCLUDE_DIR)/prereq.mk
+include $(INCLUDE_DIR)/host.mk
 
 define shvar
 V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
-- 
cgit v1.2.3