summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-27 05:15:40 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-27 05:15:40 +0000
commitf06fa034da60749dc6a44b2b174eee1c05762383 (patch)
tree41cca86ddf45a0c187ecb7163293ba1869b52545
parent6cf14b7f8879aa29602a3f3929b53dd3fa82414a (diff)
Remove host include search pathes from Makefiles
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1072 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/ulogd/package/link-pcap.patch15
-rw-r--r--openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch24
-rw-r--r--openwrt/package/ulogd/patches/ulogd-1.23-no-rej.patch20
3 files changed, 44 insertions, 15 deletions
diff --git a/openwrt/package/ulogd/package/link-pcap.patch b/openwrt/package/ulogd/package/link-pcap.patch
deleted file mode 100644
index 4e7cfc0d4d..0000000000
--- a/openwrt/package/ulogd/package/link-pcap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ulogd-1.23/pcap/Makefile.in.orig 2004-03-23 23:36:04.000000000 +0100
-+++ ulogd-1.23/pcap/Makefile.in 2005-05-16 00:14:13.000000000 +0200
-@@ -14,10 +14,10 @@
- distrib:
-
- $(SHARED_LIBS): %.so: %_sh.o
-- $(LD) -shared -o $@ $< -lc -lpcap
-+ $(LD) -shared $(PCAP_LDFLAGS) -o $@ $< -lc -lpcap
-
- %_sh.o: %.c
-- $(CC) $(SH_CFLAGS) -o $@ -c $<
-+ $(CC) $(PCAP_CFLAGS) $(SH_CFLAGS) -o $@ -c $<
-
- clean:
- $(RM) $(SHARED_LIBS) *.o
diff --git a/openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch b/openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch
new file mode 100644
index 0000000000..b4721121f6
--- /dev/null
+++ b/openwrt/package/ulogd/patches/ulogd-1.23-inc-patch.patch
@@ -0,0 +1,24 @@
+diff -ruN ulogd-1.23-old/Rules.make.in ulogd-1.23-new/Rules.make.in
+--- ulogd-1.23-old/Rules.make.in 2005-02-19 22:32:40.000000000 +0100
++++ ulogd-1.23-new/Rules.make.in 2005-05-27 07:45:18.000000000 +0200
+@@ -22,7 +22,7 @@
+ CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
+ # doesn't work for subdirs
+ #CFLAGS+=$(INCIPULOG) $(INCCONFFILE)
+-CFLAGS+=-I/lib/modules/`uname -r`/build/include
++#CFLAGS+=-I/lib/modules/`uname -r`/build/include
+ #CFLAGS+=@DEFS@
+ #CFLAGS+=-g -DDEBUG -DDEBUG_MYSQL -DDEBUG_PGSQL
+
+diff -ruN ulogd-1.23-old/libipulog/Makefile.in ulogd-1.23-new/libipulog/Makefile.in
+--- ulogd-1.23-old/libipulog/Makefile.in 2004-03-23 23:36:06.000000000 +0100
++++ ulogd-1.23-new/libipulog/Makefile.in 2005-05-27 07:44:21.000000000 +0200
+@@ -1,7 +1,7 @@
+ #
+
+ include @top_srcdir@/Rules.make
+-CFLAGS+=-Iinclude -I/usr/src/linux/include
++CFLAGS+=-Iinclude
+
+ libipulog.a: libipulog.o
+ $(LD) -i $< -o $@
diff --git a/openwrt/package/ulogd/patches/ulogd-1.23-no-rej.patch b/openwrt/package/ulogd/patches/ulogd-1.23-no-rej.patch
new file mode 100644
index 0000000000..dd464917fb
--- /dev/null
+++ b/openwrt/package/ulogd/patches/ulogd-1.23-no-rej.patch
@@ -0,0 +1,20 @@
+diff -ruN ulogd-1.23-old/ulogd.conf.in.rej ulogd-1.23-new/ulogd.conf.in.rej
+--- ulogd-1.23-old/ulogd.conf.in.rej 2005-04-18 16:19:06.000000000 +0200
++++ ulogd-1.23-new/ulogd.conf.in.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,16 +0,0 @@
+-***************
+-*** 62,68 ****
+- user="laforge"
+- db="ulogd"
+- host="localhost"
+-- use_ssl=0
+-
+- [PGSQL]
+- table="ulog"
+---- 62,67 ----
+- user="laforge"
+- db="ulogd"
+- host="localhost"
+-
+- [PGSQL]
+- table="ulog"