Commit 6d3b4fac authored by Romain Naour's avatar Romain Naour Committed by Peter Korsgaard
Browse files

ngrep: fix static linking issue with libpcre 

Adding -lpcre in LDFLAGS place the library before object files:
gcc ... -lpcre -L.../sysroot/usr/lib -s -o ngrep ngrep.o -lpcap

Makefile.in is patched to use @LIBS@ for adding -lpcre in the right place.

Fixes:
http://autobuild.buildroot.net/results/684/684a3bed28d13ef5e5156257aade3b9aff32f180



[Peter: fixup patch description]
Signed-off-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent c9d2b23c

package/ngrep/ngrep-0003-fix-static-link.patch

0 → 100644
+25 −0
Original line number Diff line number Diff line 
ngrep: fix static link with pcre



Libraries must be placed after object files.



Signed-off-by: Romain Naour <romain.naour@openwide.fr>

---

 Makefile.in | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/Makefile.in b/Makefile.in

index 2ae4506..761d7d9 100644

--- a/Makefile.in

+++ b/Makefile.in

@@ -11,7 +11,7 @@ CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@

 INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@

 

 LDFLAGS=@LDFLAGS@ @PCAP_LINK@

-LIBS=-lpcap @EXTRA_LIBS@ 

+LIBS=@LIBS@ @EXTRA_LIBS@

 

 STRIPFLAG=@STRIPFLAG@

 

-- 

1.8.1.4

package/ngrep/ngrep.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSIO 
NGREP_LICENSE = BSD-4c-like

NGREP_LICENSE_FILES = LICENSE.txt

NGREP_INSTALL_STAGING = YES

NGREP_CONF_ENV = LDFLAGS="-lpcre"

NGREP_CONF_ENV = LIBS="-lpcre"

NGREP_CONF_OPT =  \

	--with-pcap-includes=$(STAGING_DIR)/usr/include \

	--enable-pcre \