Prechádzať zdrojové kódy

minidlna: fix static linking

The configure script / Makefile forgets to link with some of the dependent
libraries breaking static linking, so help it along.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 11 rokov pred
rodič
commit
822b3f0b0f

+ 0 - 2
package/minidlna/Config.in

@@ -4,8 +4,6 @@ config BR2_PACKAGE_MINIDLNA
 	depends on BR2_INET_IPV6 # ffmpeg
 	depends on BR2_USE_MMU # fork
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	# static build is broken w.r.t libgcc_s
-	depends on !BR2_PREFER_STATIC_LIB
 	select BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_FLAC
 	select BR2_PACKAGE_LIBVORBIS # selects libogg

+ 7 - 1
package/minidlna/minidlna.mk

@@ -13,8 +13,14 @@ MINIDLNA_DEPENDENCIES = \
 	ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \
 	host-xutil_makedepend
 
-# static build is broken w.r.t libgcc_s
+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'
+else
 MINIDLNA_CONF_OPT = \
 	--disable-static
+endif
 
 $(eval $(autotools-package))