summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-14 14:11:12 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-14 14:11:12 +0000
commit260c8f7eb66e9cb0f0ebe17b4ff458faa13aceb8 (patch)
treef16ae52a2dd56a963ff2548c3b12640324e86251 /package
parentd927107601ca92fb201515ebfe632562d72eb05a (diff)
opkg: apparently array bounds checking is gcc 4.3 specific, move -Wno-array-bounds into TARGET_CFLAGS instead of a patch and make it conditional
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14508 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/opkg/Makefile2
-rw-r--r--package/opkg/patches/005-array_warnings.patch10
2 files changed, 1 insertions, 11 deletions
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 91db72476..6a857905b 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -40,7 +40,7 @@ define Package/opkg/conffiles
/etc/opkg.conf
endef
-TARGET_CFLAGS += $(FPIC)
+TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3),-Wno-array-bounds)
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
diff --git a/package/opkg/patches/005-array_warnings.patch b/package/opkg/patches/005-array_warnings.patch
deleted file mode 100644
index deaffbe33..000000000
--- a/package/opkg/patches/005-array_warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libopkg/Makefile.am
-+++ b/libopkg/Makefile.am
-@@ -1,6 +1,6 @@
-
- HOST_CPU=@host_cpu@
--AM_CFLAGS=-Wall -Werror -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
-+AM_CFLAGS=-Wall -Werror -Wno-array-bounds -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir) $(BIGENDIAN_CFLAGS) $(CURL_CFLAGS) $(GPGME_CFLAGS)
-
- libopkg_includedir=$(includedir)/libopkg
- libopkg_include_HEADERS= opkg.h