浏览代码

do not use rpath with staging dir information

Waldemar Brodkorb 14 年之前
父节点
当前提交
b1044672f8
共有 2 个文件被更改,包括 28 次插入1 次删除
  1. 1 1
      package/libpcap/Makefile
  2. 27 0
      package/libpcap/patches/patch-pcap-config_in

+ 1 - 1
package/libpcap/Makefile

@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libpcap
 PKG_VERSION:=		1.1.1
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1bca27d206970badae248cfa471bbb47
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs

+ 27 - 0
package/libpcap/patches/patch-pcap-config_in

@@ -0,0 +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
+ 	esac
+ 	shift
+ done
+-if [ "@V_RPATH_OPT@" != "" ]
+-then
+-	#
+-	# If libdir isn't /usr/lib, add it to the run-time linker path.
+-	#
+-	if [ "@libdir@" != "/usr/lib" ]
+-	then
+-		RPATH=@V_RPATH_OPT@@libdir@
+-	fi
+-fi
+ if [ "$static" = 1 ]
+ then
+ 	#
+@@ -77,6 +67,6 @@ else
+ 		echo "-I@includedir@"
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-L@libdir@ $RPATH -lpcap"
++		echo "-L@libdir@ -lpcap"
+ 	fi
+ fi