| Message ID | 1417289292-7006-1-git-send-email-bernd.kuhls@t-online.de |
|---|---|
| State | Changes Requested |
| Headers | show |
Bernd, All, On 2014-11-29 20:28 +0100, Bernd Kuhls spake thusly: > Fixes > http://autobuild.buildroot.net/results/c38/c388b71ae154c062a863a35eca70a8c2ce121524/ > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > package/minidlna/minidlna.mk | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk > index 9e997f3..3a0ca35 100644 > --- a/package/minidlna/minidlna.mk > +++ b/package/minidlna/minidlna.mk > @@ -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)' > else > MINIDLNA_CONF_OPTS = \ > --disable-static > -- > 1.7.10.4 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Dear Yann E. MORIN, On Sun, 7 Dec 2014 22:10:25 +0100, Yann E. MORIN wrote: > 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
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 9e997f3..3a0ca35 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -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
Fixes http://autobuild.buildroot.net/results/c38/c388b71ae154c062a863a35eca70a8c2ce121524/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/minidlna/minidlna.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)