jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 06:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

minidlna: fix static linking

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2014-01-08 09:00:11 +01:00
parent 40ce42121c
commit 822b3f0b0f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/minidlna/Config.in
View File

@ -4,8 +4,6 @@ config BR2_PACKAGE_MINIDLNA
depends on BR2_INET_IPV6 # ffmpeg depends on BR2_INET_IPV6 # ffmpeg
depends on BR2_USE_MMU # fork depends on BR2_USE_MMU # fork
depends on BR2_TOOLCHAIN_HAS_THREADS 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_FFMPEG
select BR2_PACKAGE_FLAC select BR2_PACKAGE_FLAC
select BR2_PACKAGE_LIBVORBIS # selects libogg select BR2_PACKAGE_LIBVORBIS # selects libogg

8
package/minidlna/minidlna.mk
View File

@ -13,8 +13,14 @@ MINIDLNA_DEPENDENCIES = \
ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \
host-xutil_makedepend 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 = \ MINIDLNA_CONF_OPT = \
--disable-static --disable-static
endif
$(eval $(autotools-package)) $(eval $(autotools-package))