package/vlc: Disable broken linking of vlc-static
- vlc-0001-vlc-static.patch disables linking of bin/vlc-static - remove vlc-0001-fix-link-error.patch as it should have fixed vlc-static, this patch is not needed anymore Fixes http://autobuild.buildroot.net/results/acc/acc212dc70abbf86be5d764895ee50b1eb64668f/ http://autobuild.buildroot.net/results/830/83025b9072221f9edaa4638687950f8086e1c19d/ http://autobuild.buildroot.net/results/0b5/0b59e2d0b17501d10c005292a2e1916f23a12a0e/ http://autobuild.buildroot.net/results/473/473e601b009d8b045cd6041f3725e9dc81e31f03/ http://autobuild.buildroot.net/results/3b2/3b2815d27a2252a2d677eed5c479a88bbb04d655/ http://autobuild.buildroot.net/results/022/022252176c051ff3365b2cb820f32aafc802803a/ http://autobuild.buildroot.net/results/2db/2dbaa3603b3dab9e06a37993fb235d009bd22df9/ http://autobuild.buildroot.net/results/0d4/0d4199c3271bbd7cf8a04403c5dafa1178f75fb1/ http://autobuild.buildroot.net/results/cb8/cb8402fc994697f157348d88f848357ca21156a4/ http://autobuild.buildroot.net/results/666/6660453c78d1557b645e8fd5b3ed2076e64fc91a/ http://autobuild.buildroot.net/results/2b9/2b9bbeea4a4b2953b445f54b5ce1b2d8f520451d/ http://autobuild.buildroot.net/results/7ff/7ff072f9b7487fb27070c58053dbcf96b7dd7a56/ http://autobuild.buildroot.net/results/ab1/ab1feef329c9da6cd3a4df46b6724030159a4003/ http://autobuild.buildroot.net/results/bd3/bd3a1bc0c6f333836c1888d8404832de948df739/ http://autobuild.buildroot.net/results/f70/f708306808953a48f8cc870d13be0e62ed2ece2e/ http://autobuild.buildroot.net/results/3c5/3c53f6e0f3c0367b760bbf2140acdb06b2b50223/ http://autobuild.buildroot.net/results/080/080fab04cd252f765dd197c9941470bfdf6ba629/ 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:
parent
4a52637c58
commit
7f4075f7de
|
@ -1,28 +0,0 @@
|
|||
Fix a link error.
|
||||
|
||||
Signed-off-by: Simon Dawson <spdawson@gmail.com>
|
||||
|
||||
diff -Nurp a/bin/Makefile.am b/bin/Makefile.am
|
||||
--- a/bin/Makefile.am 2013-12-03 09:12:34.000000000 +0000
|
||||
+++ b/bin/Makefile.am 2014-01-06 22:03:34.888581851 +0000
|
||||
@@ -44,7 +44,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
|
||||
-DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \
|
||||
$(NULL)
|
||||
vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
|
||||
-vlc_static_LDADD = $(vlc_LDADD)
|
||||
+vlc_static_LDADD = $(vlc_LDADD) ../compat/libcompat.la
|
||||
vlc_static_LDFLAGS = $(vlc_LDFLAGS)
|
||||
|
||||
if HAVE_WIN32
|
||||
diff -Nurp a/bin/Makefile.in b/bin/Makefile.in
|
||||
--- a/bin/Makefile.in 2013-12-07 16:17:01.000000000 +0000
|
||||
+++ b/bin/Makefile.in 2014-01-06 22:04:10.888444978 +0000
|
||||
@@ -1049,7 +1049,7 @@ vlc_static_CFLAGS = $(AM_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
|
||||
-vlc_static_LDADD = $(vlc_LDADD)
|
||||
+vlc_static_LDADD = $(vlc_LDADD) ../compat/libcompat.la
|
||||
vlc_static_LDFLAGS = $(vlc_LDFLAGS) $(am__append_7)
|
||||
@HAVE_WIN32_TRUE@vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
|
||||
vlc_cache_gen_SOURCES = cachegen.c
|
24
package/vlc/vlc-0001-vlc-static.patch
Normal file
24
package/vlc/vlc-0001-vlc-static.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
diff -uNr vlc-2.1.5.org/bin/Makefile.am vlc-2.1.5/bin/Makefile.am
|
||||
--- vlc-2.1.5.org/bin/Makefile.am 2013-12-03 10:12:34.000000000 +0100
|
||||
+++ vlc-2.1.5/bin/Makefile.am 2014-08-03 12:30:06.722154518 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
# Building vlc
|
||||
#
|
||||
bin_PROGRAMS = vlc
|
||||
-noinst_PROGRAMS = vlc-static
|
||||
+noinst_PROGRAMS =
|
||||
noinst_DATA =
|
||||
vlclib_PROGRAMS = vlc-cache-gen
|
||||
EXTRA_PROGRAMS = vlc-wrapper
|
||||
diff -uNr vlc-2.1.5.org/Makefile.am vlc-2.1.5/Makefile.am
|
||||
--- vlc-2.1.5.org/Makefile.am 2014-02-14 18:40:50.000000000 +0100
|
||||
+++ vlc-2.1.5/Makefile.am 2014-08-03 12:29:52.059010766 +0200
|
||||
@@ -607,7 +607,7 @@
|
||||
cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
|
||||
|
||||
core: libvlc vlc$(EXEEXT)
|
||||
- cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
|
||||
+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
|
||||
|
||||
doc:
|
||||
cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
|
Loading…
Reference in a new issue