Menuconfig will not treat 'select FOO' as a real dependency

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 97f82b9..12e4190 100644 (file)
--- 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
 
 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)
 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_FILE_DEPEND)),$(PKG_BUILD_DIR))
       ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR))

-        _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))
+        $$(info Forcing package rebuild)

         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
     endif
         $(PKG_BUILD_DIR)/.prepared: package-clean
       endif
     endif


@@ -177,7 +176,8 @@ define BuildPackage
        echo "Version: $(VERSION)"; \
        echo "Depends: $$(IDEPEND_$(1))"; \
        echo "Provides: $(PROVIDES)"; \
        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)"; \
        echo "Category: $(CATEGORY)"; \
        echo "Title: $(TITLE)"; \
        echo "Maintainer: $(MAINTAINER)"; \


@@ -263,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)))
       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
             $(PKG_BUILD_DIR)/.built: package-rebuild

-          endif
-
-          ifneq ($$(_INFO),)
-            $$(info Rebuilding $$(_INFO))
+            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))

           endif
         endif
       endif
           endif
         endif
       endif


@@ -297,9 +293,10 @@ define Build/Configure/Default
                CXXFLAGS="$(TARGET_CFLAGS)" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                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" \

                PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
                $(2) \
                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) \
                --target=$(GNU_TARGET_NAME) \
                --host=$(GNU_TARGET_NAME) \
                --build=$(GNU_HOST_NAME) \


@@ -326,11 +323,12 @@ define Build/Configure
 endef
 
 define Build/Compile/Default
 endef
 
 define Build/Compile/Default

+       CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
+       LDFLAGS="$(EXTRA_LDFLAGS) " \

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                CROSS="$(TARGET_CROSS)" \
        $(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
                ARCH="$(ARCH)" \
                $(1);
 endef