[rb532] switch to 2.6.30-rc7, fixes #5111

[openwrt.git] / include / package-defaults.mk

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 3f3273f..700bc5b 100644 (file)
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -13,7 +13,7 @@ define Package/Default
   PROVIDES:=
   EXTRA_DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
   PROVIDES:=
   EXTRA_DEPENDS:=
   MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>

-  SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
+  SOURCE:=$(patsubst $(TOPDIR)/%,%,$(CURDIR))

   ifneq ($(PKG_VERSION),)
     ifneq ($(PKG_RELEASE),)
       VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
   ifneq ($(PKG_VERSION),)
     ifneq ($(PKG_RELEASE),)
       VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)


@@ -32,6 +32,7 @@ define Package/Default
   TITLE:=
   KCONFIG:=
   BUILDONLY:=
   TITLE:=
   KCONFIG:=
   BUILDONLY:=

+  URL:=

 endef
 
 Build/Patch:=$(Build/Patch/Default)
 endef
 
 Build/Patch:=$(Build/Patch/Default)


@@ -42,9 +43,6 @@ ifneq ($(strip $(PKG_UNPACK)),)
   endef
 endif
 
   endef
 endif
 

-export PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR_HOST)/usr/lib/pkgconfig
-export PKG_CONFIG_LIBDIR=$(STAGING_DIR)/usr/lib/pkgconfig
-

 CONFIGURE_PREFIX:=/usr
 CONFIGURE_ARGS = \
                --target=$(GNU_TARGET_NAME) \
 CONFIGURE_PREFIX:=/usr
 CONFIGURE_ARGS = \
                --target=$(GNU_TARGET_NAME) \


@@ -70,8 +68,6 @@ CONFIGURE_VARS = \
                CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
                CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
                CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \

-               PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
-               PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"

 
 CONFIGURE_PATH = .
 CONFIGURE_CMD = ./configure
 
 CONFIGURE_PATH = .
 CONFIGURE_CMD = ./configure