X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e7a64765ac6dd0facfa7da5ec053702b8a05fe1f..80d27b5e3cfc660e82f351d892248ff6595c4546:/include/package.mk

diff --git a/include/package.mk b/include/package.mk
index 1edac0e0a..12e4190ef 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -14,15 +14,14 @@ include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
-PKG_CONFIG_PATH:=.
+PKG_CONFIGURE_PATH:=.
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
 
 define Build/DefaultTargets
   ifeq ($(DUMP),)
     ifeq ($(CONFIG_AUTOREBUILD),y)
-      _INFO:=
-      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR))
-        _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
+      ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))
+        $$(info Forcing package rebuild)
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
     endif
@@ -177,9 +176,11 @@ define BuildPackage
 	echo "Version: $(VERSION)"; \
 	echo "Depends: $$(IDEPEND_$(1))"; \
 	echo "Provides: $(PROVIDES)"; \
-	echo "Build-Depends: $(PKG_BUILDDEP)"; \
+	echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \
+	echo "Section: $(SECTION)"; \
 	echo "Category: $(CATEGORY)"; \
 	echo "Title: $(TITLE)"; \
+	echo "Maintainer: $(MAINTAINER)"; \
 	if isset $(call shvar,Package/$(1)/description); then \
 		echo -n "Description: "; \
 		getvar $(call shvar,Package/$(1)/description); \
@@ -262,12 +263,8 @@ define BuildPackage
       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)))
-            _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1)))
             $(PKG_BUILD_DIR)/.built: package-rebuild
-          endif
-
-          ifneq ($$(_INFO),)
-            $$(info Rebuilding $$(_INFO))
+            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
           endif
         endif
       endif
@@ -297,8 +294,9 @@ define Build/Configure/Default
 		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" \
+		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		$(2) \
-		$(PKG_CONFIG_PATH)/configure \
+		$(PKG_CONFIGURE_PATH)/configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -325,11 +323,12 @@ define Build/Configure
 endef
 
 define Build/Compile/Default
+	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
+	LDFLAGS="$(EXTRA_LDFLAGS) " \
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CROSS="$(TARGET_CROSS)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \
-		EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
+		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
 		ARCH="$(ARCH)" \
 		$(1);
 endef