Skip to contentSkip to conversation

xl2tp: fix static build

PATCH New Baruch Siach 3 participants 3 messages Nov 23, 2014 – Nov 24, 2014

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 xl2tp: fix static build

Use pcap-config to list dependencies of libpcap.

Fixes:
http://autobuild.buildroot.net/results/87f/87ff92831d265d437aa0dfcfb99e954f76597761/
http://autobuild.buildroot.net/results/cd5/cd5487e76259752cbe58b171f9a58970916f7bb8/

Signed-off-by Baruch Siach <[email protected]>
---
 package/xl2tp/xl2tp.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/xl2tp/xl2tp.mk +5 -1
index 0b2f7f1758f5..abed7e851fa2 100644
@@ -10,9 +10,13 @@ XL2TP_DEPENDENCIES = libpcap openssl
 XL2TP_LICENSE = GPLv2
 XL2TP_LICENSE_FILES = LICENSE
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+XL2TP_LDLIBS = LDLIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
+endif
+
 define XL2TP_BUILD_CMDS
 	$(SED) 's/ -O2 //' $(@D)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(XL2TP_LDLIBS) -C $(@D)
 endef
 
 define XL2TP_INSTALL_TARGET_CMDS
Signature · 1 line
2.1.3
#1 lore raw

PATCH 1/1 xl2tp: fix static build

Baruch, All,

On 2014-11-23 12:29 +0200, Baruch Siach spake thusly:

Quoted 7 lines

Use pcap-config to list dependencies of libpcap.

Fixes:
http://autobuild.buildroot.net/results/87f/87ff92831d265d437aa0dfcfb99e954f76597761/
http://autobuild.buildroot.net/results/cd5/cd5487e76259752cbe58b171f9a58970916f7bb8/

Signed-off-by Baruch Siach <[email protected]>

I was working on a similar fix, so:

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 30 lines
---
 package/xl2tp/xl2tp.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/xl2tp/xl2tp.mk +5 -1
index 0b2f7f1758f5..abed7e851fa2 100644
@@ -10,9 +10,13 @@ XL2TP_DEPENDENCIES = libpcap openssl
 XL2TP_LICENSE = GPLv2
 XL2TP_LICENSE_FILES = LICENSE
 
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+XL2TP_LDLIBS = LDLIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
+endif
+
 define XL2TP_BUILD_CMDS
 	$(SED) 's/ -O2 //' $(@D)/Makefile
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) $(XL2TP_LDLIBS) -C $(@D)
 endef
 
 define XL2TP_INSTALL_TARGET_CMDS
Signature · 6 lines
2.1.3

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH 1/1 xl2tp: fix static build

In reply to Baruch Siach

Dear Baruch Siach,

Quoted 10 lines · Baruch Siach

Use pcap-config to list dependencies of libpcap.

Fixes:
http://autobuild.buildroot.net/results/87f/87ff92831d265d437aa0dfcfb99e954f76597761/
http://autobuild.buildroot.net/results/cd5/cd5487e76259752cbe58b171f9a58970916f7bb8/

Signed-off-by Baruch Siach <[email protected]>
---
 package/xl2tp/xl2tp.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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