Skip to contentSkip to conversation

libpcap: update libnl fix patch

PATCH New Gustavo Zacarias 3 participants 3 messages Mar 14, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 libpcap: update libnl fix patch

We also need to nuke bad LIBS assumptions, fixes:
http://autobuild.buildroot.net/results/bbd/bbde2b62d4b677e71a62b25fb9ccb4ac4764a4aa/
http://autobuild.buildroot.net/results/5de/5dedfb19df476a633e4449d44e7ba2778bf5b737/
...and lots more of those kind.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/libpcap/0001-remove-libnl-include-path.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
package/libpcap/0001-remove-libnl-include-path.patch +10 -4
index a4039ef..d0760d4 100644
@@ -4,16 +4,22 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
 [Gustavo: update for 1.7.2]
 
 diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in
---- libpcap-1.7.2.orig/configure.in	2015-03-11 10:02:44.416189921 -0300
-+++ libpcap-1.7.2/configure.in	2015-03-11 10:03:03.967633673 -0300
-@@ -466,9 +466,8 @@
+--- libpcap-1.7.2.orig/configure.in	2015-03-14 08:02:05.538706347 -0300
++++ libpcap-1.7.2/configure.in	2015-03-14 08:17:22.637519050 -0300
+@@ -461,14 +461,13 @@
+ 			#
+ 			# Yes, we have libnl 3.x.
+ 			#
+-			LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
++			LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
  			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
  			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
  			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
 -			V_INCLS="$V_INCLS ${incdir}"
  			have_any_nl="yes"
 -		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
-+		],[], ${libnldir} -lnl-genl-3 -lnl-3 )
++		],[], -lnl-genl-3 -lnl-3 )
  
  		if test x$have_any_nl = xno ; then
  			#
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/1 libpcap: update libnl fix patch

Hi Gustavo,

Le 14/03/2015 12:21, Gustavo Zacarias a ?crit :

Quoted 7 lines

We also need to nuke bad LIBS assumptions, fixes:
http://autobuild.buildroot.net/results/bbd/bbde2b62d4b677e71a62b25fb9ccb4ac4764a4aa/
http://autobuild.buildroot.net/results/5de/5dedfb19df476a633e4449d44e7ba2778bf5b737/
...and lots more of those kind.

Signed-off-by Gustavo Zacarias <[email protected]>

---

Before your patch, pcap-config --static --libs returned "-Llinux/lib/.libs" and that why tcpreplay package was broken.

Build tested with this patch applied, now "-Llinux/lib/.libs" is gone.

Reviewed-by Romain Naour <[email protected]>
Tested-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 35 lines
 package/libpcap/0001-remove-libnl-include-path.patch | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
package/libpcap/0001-remove-libnl-include-path.patch +10 -4
index a4039ef..d0760d4 100644
@@ -4,16 +4,22 @@ Signed-off-by: Thomas Petazzoni <[email protected]>
 [Gustavo: update for 1.7.2]
 
 diff -Nura libpcap-1.7.2.orig/configure.in libpcap-1.7.2/configure.in
---- libpcap-1.7.2.orig/configure.in	2015-03-11 10:02:44.416189921 -0300
-+++ libpcap-1.7.2/configure.in	2015-03-11 10:03:03.967633673 -0300
-@@ -466,9 +466,8 @@
+--- libpcap-1.7.2.orig/configure.in	2015-03-14 08:02:05.538706347 -0300
++++ libpcap-1.7.2/configure.in	2015-03-14 08:17:22.637519050 -0300
+@@ -461,14 +461,13 @@
+ 			#
+ 			# Yes, we have libnl 3.x.
+ 			#
+-			LIBS="${libnldir} -lnl-genl-3 -lnl-3 $LIBS"
++			LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
  			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
  			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
  			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
 -			V_INCLS="$V_INCLS ${incdir}"
  			have_any_nl="yes"
 -		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
-+		],[], ${libnldir} -lnl-genl-3 -lnl-3 )
++		],[], -lnl-genl-3 -lnl-3 )
 
  		if test x$have_any_nl = xno ; then
  			#
Applied
#2 lore raw

PATCH 1/1 libpcap: update libnl fix patch

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 6 lines · Gustavo Zacarias

We also need to nuke bad LIBS assumptions, fixes:
http://autobuild.buildroot.net/results/bbd/bbde2b62d4b677e71a62b25fb9ccb4ac4764a4aa/
http://autobuild.buildroot.net/results/5de/5dedfb19df476a633e4449d44e7ba2778bf5b737/
...and lots more of those kind.

Signed-off-by Gustavo Zacarias <[email protected]>

Applied, thanks! Thanks a lot for looking into this!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com