deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/minidlna: unavailable for static builds

Browse source 
minidlna has long standing issues with static-only builds:
http://patchwork.ozlabs.org/patch/501844/
http://patchwork.ozlabs.org/patch/506310/

This patch fixes
http://autobuild.buildroot.net/results/d73/d7370d0f8d1c7c028996feab0ea4f36edbf8a698/
http://autobuild.buildroot.net/results/575/5752be7c1820579425ba24178482ab0d6eea7b62/
"pack_utils.c:(.text+0x9a8): multiple definition of `free_metadata'"

The multiple definition can be fixed of course but instead of digging
deeper and deeper into this mess let's disable static builds.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-03-19 10:43:42 +01:00 committed by Thomas Petazzoni
parent a3694ed7d7
commit 7d93e2bfa1
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/minidlna/Config.in
View file

@ -1,5 +1,6 @@
config BR2_PACKAGE_MINIDLNA
bool "minidlna"
depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR # flac
depends on BR2_USE_MMU # fork
depends on BR2_TOOLCHAIN_HAS_THREADS
@ -19,7 +20,8 @@ config BR2_PACKAGE_MINIDLNA
http://minidlna.sourceforge.net/
comment "minidlna needs a toolchain w/ threads, wchar"
comment "minidlna needs a toolchain w/ dynamic library, threads, wchar"
depends on BR2_USE_MMU
depends on !BR2_nios2
depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
BR2_STATIC_LIBS

9
package/minidlna/minidlna.mk
View file

@ -14,17 +14,8 @@ MINIDLNA_DEPENDENCIES = \
ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \
host-xutil_makedepend
ifeq ($(BR2_STATIC_LIBS),y)
# the configure script / Makefile forgets to link with some of the dependent
# libraries breaking static linking, so help it along
MINIDLNA_PKGCONFIG_DEPS = libavcodec libexif vorbis sqlite3
MINIDLNA_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs $(MINIDLNA_PKGCONFIG_DEPS)`
MINIDLNA_STATIC_LIBS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)
MINIDLNA_CONF_ENV += LIBS="$(MINIDLNA_STATIC_LIBS)"
else
MINIDLNA_CONF_OPTS = \
--disable-static
endif
define MINIDLNA_INSTALL_CONF
$(INSTALL) -D -m 644 $(@D)/minidlna.conf $(TARGET_DIR)/etc/minidlna.conf