summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-08 12:07:14 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-08 12:07:14 +0000
commitd654a6572b7c82887b1f71683c817b39178a7bed (patch)
tree0a9facb967fc5147af4c86187c9f8677aeaffa8d
parent58c6fe352d5d9ad73abb4f6ba17e68a0f627b6f2 (diff)
fix inotify detection for linux 2.4 (fixes glib2 and packages that depend on it on brcm-2.4)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12896 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package.mk6
-rw-r--r--include/site/mipsel-linux2.4-uclibc5
2 files changed, 10 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk
index d67a38622..0f3d21ee9 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -31,7 +31,11 @@ include $(INCLUDE_DIR)/package-bin.mk
include $(INCLUDE_DIR)/autotools.mk
override MAKEFLAGS=
-export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(patsubst %gnueabi,%,$(REAL_GNU_TARGET_NAME))
+CONFIG_SITE:=$(INCLUDE_DIR)/site/$(patsubst %gnueabi,%,$(REAL_GNU_TARGET_NAME))
+ifneq ($(CONFIG_LINUX_2_4),)
+ CONFIG_SITE:=$(subst linux-,linux2.4-,$(CONFIG_SITE))
+endif
+export CONFIG_SITE
CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
diff --git a/include/site/mipsel-linux2.4-uclibc b/include/site/mipsel-linux2.4-uclibc
new file mode 100644
index 000000000..3412411cb
--- /dev/null
+++ b/include/site/mipsel-linux2.4-uclibc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. $TOPDIR/include/site/mipsel-linux
+. $TOPDIR/include/site/linux-uclibc
+ac_cv_header_sys_inotify_h=no