summaryrefslogtreecommitdiff
path: root/package/libpcap/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/libpcap/patches')
-rw-r--r--package/libpcap/patches/patch-Makefile_in13
-rw-r--r--package/libpcap/patches/patch-pcap-config_in20
2 files changed, 10 insertions, 23 deletions
diff --git a/package/libpcap/patches/patch-Makefile_in b/package/libpcap/patches/patch-Makefile_in
deleted file mode 100644
index d967498c3..000000000
--- a/package/libpcap/patches/patch-Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- libpcap-1.1.1.orig/Makefile.in 2010-04-05 19:54:05.000000000 +0200
-+++ libpcap-1.1.1/Makefile.in 2010-12-08 23:30:21.000000000 +0100
-@@ -474,8 +474,8 @@ bpf_filter.o: bpf_filter.c
- #
- pcap-config: $(srcdir)/pcap-config.in
- @rm -f $@ $@.tmp
-- sed -e 's|@includedir[@]|$(includedir)|g' \
-- -e 's|@libdir[@]|$(libdir)|g' \
-+ sed -e 's|@includedir[@]|$(STAGING_TARGET_DIR)$(includedir)|g' \
-+ -e 's|@libdir[@]|$(STAGING_TARGET_DIR)$(libdir)|g' \
- -e 's|@LIBS[@]|$(LIBS)|g' \
- -e 's|@V_RPATH_OPT[@]|$(V_RPATH_OPT)|g' \
- $(srcdir)/pcap-config.in >$@.tmp
diff --git a/package/libpcap/patches/patch-pcap-config_in b/package/libpcap/patches/patch-pcap-config_in
index b50f6fb48..2a73106a4 100644
--- a/package/libpcap/patches/patch-pcap-config_in
+++ b/package/libpcap/patches/patch-pcap-config_in
@@ -1,27 +1,27 @@
---- libpcap-1.1.1.orig/pcap-config.in 2010-03-12 02:56:54.000000000 +0100
-+++ libpcap-1.1.1/pcap-config.in 2011-01-06 21:29:12.000000000 +0100
-@@ -29,16 +29,6 @@ do
+--- libpcap-1.2.1.orig/pcap-config.in 2011-03-28 22:37:56.000000000 +0200
++++ libpcap-1.2.1/pcap-config.in 2012-03-24 11:15:47.343023269 +0100
+@@ -36,16 +36,6 @@ do
esac
shift
done
--if [ "@V_RPATH_OPT@" != "" ]
+-if [ "$V_RPATH_OPT" != "" ]
-then
- #
- # If libdir isn't /usr/lib, add it to the run-time linker path.
- #
-- if [ "@libdir@" != "/usr/lib" ]
+- if [ "$libdir" != "/usr/lib" ]
- then
-- RPATH=@V_RPATH_OPT@@libdir@
+- RPATH=$V_RPATH_OPT$libdir
- fi
-fi
if [ "$static" = 1 ]
then
#
-@@ -77,6 +67,6 @@ else
- echo "-I@includedir@"
+@@ -84,6 +74,6 @@ else
+ echo "-I$includedir"
elif [ "$show_libs" = 1 ]
then
-- echo "-L@libdir@ $RPATH -lpcap"
-+ echo "-L@libdir@ -lpcap"
+- echo "-L$libdir $RPATH -lpcap"
++ echo "-L$libdir -lpcap"
fi
fi