Skip to contentSkip to conversation

package/minidlna: fix static linking with OpenSSL enabled

PATCH New Bernd Kuhls 3 participants 3 messages Nov 29, 2014 – Dec 7, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/minidlna: fix static linking with OpenSSL enabled

Fixes
http://autobuild.buildroot.net/results/c38/c388b71ae154c062a863a35eca70a8c2ce121524/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/minidlna/minidlna.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/minidlna/minidlna.mk +3 -1
index 9e997f3..3a0ca35 100644
@@ -18,7 +18,9 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y)
 # the configure script / Makefile forgets to link with some of the dependent
 # libraries breaking static linking, so help it along
 MINIDLNA_CONF_ENV = \
-	LIBS='-lavformat -lavcodec -lavutil -logg -lz -lpthread -lm'
+	LIBS='-lavformat -lavcodec -lavutil -logg \
+		$(if $(BR2_PACKAGE_OPENSSL),-lssl -lcrypto) \
+		-lz -lpthread -lm'
 else
 MINIDLNA_CONF_OPTS = \
 	--disable-static
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 package/minidlna: fix static linking with OpenSSL enabled

Bernd, All,

On 2014-11-29 20:28 +0100, Bernd Kuhls spake thusly:

Quoted 13 lines

Fixes
http://autobuild.buildroot.net/results/c38/c388b71ae154c062a863a35eca70a8c2ce121524/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/minidlna/minidlna.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/minidlna/minidlna.mk +0 -0
index 9e997f3..3a0ca35 100644

package/minidlna/minidlna.mk ifeq ($(BR2_PREFER_STATIC_LIB),y) · line 23

Quoted 7 lines
package/minidlna/minidlna.mk +3 -1
@@ -18,7 +18,9 @@ ifeq ($(BR2_PREFER_STATIC_LIB),y)
 # the configure script / Makefile forgets to link with some of the dependent
 # libraries breaking static linking, so help it along
 MINIDLNA_CONF_ENV = \
-	LIBS='-lavformat -lavcodec -lavutil -logg -lz -lpthread -lm'
+	LIBS='-lavformat -lavcodec -lavutil -logg \
+		$(if $(BR2_PACKAGE_OPENSSL),-lssl -lcrypto) \
+		-lz -lpthread -lm'

I'm not too fond of the way this is handled. I'd prefer we get something like:

    MINIDLNA_LIBS = -lavformat -lavcodec -lavutil -logg
    MINIDLAN_LIBS += $(if $(BR2_PACKAGE_OPENSSL),-lssl -lcrypto)
    MINIDLAN_LIBS += -lz -lpthread -lm

    MINIDLNA_CONF_ENV = LIBS='$(MINIDLNA_LIBS)'
Quoted 10 lines
package/minidlna/minidlna.mk +0 -0
 else
 MINIDLNA_CONF_OPTS = \
 	--disable-static
Signature · 6 lines
1.7.10.4

_______________________________________________
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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/minidlna: fix static linking with OpenSSL enabled

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

I'm not too fond of the way this is handled. I'd prefer we get something like:

    MINIDLNA_LIBS = -lavformat -lavcodec -lavutil -logg
    MINIDLAN_LIBS += $(if $(BR2_PACKAGE_OPENSSL),-lssl -lcrypto)
    MINIDLAN_LIBS += -lz -lpthread -lm

    MINIDLNA_CONF_ENV = LIBS='$(MINIDLNA_LIBS)'

Agreed, with maybe "$(MINIDLNA_LIBS)" instead of simple quotes.

A further possible improvement would be to switch to use pkg-config instead, so that this becomes more maintainable :-)

Thanks!

Thomas

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