mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
5ba5cd0106
Added Upstream: tags when possible.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 33c26bb898)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
Date: Tue, 1 May 2018 22:27:21 +0200
|
|
Subject: [PATCH] Disable building of statically linked vlc binary
|
|
|
|
[Bernd: rebased for 3.0.23]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
Makefile.am | 2 +-
|
|
bin/Makefile.am | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 5846e6d701..c72ceddaf2 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -106,7 +106,7 @@ libvlc: libvlccore
|
|
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
|
|
diff --git a/bin/Makefile.am b/bin/Makefile.am
|
|
index 4de299d394..2ba28ad806 100644
|
|
--- a/bin/Makefile.am
|
|
+++ b/bin/Makefile.am
|
|
@@ -6,7 +6,7 @@ bin_PROGRAMS = vlc-osx
|
|
noinst_PROGRAMS = vlc-osx-static
|
|
else
|
|
bin_PROGRAMS = vlc
|
|
-noinst_PROGRAMS = vlc-static
|
|
+noinst_PROGRAMS =
|
|
endif
|
|
endif
|
|
EXTRA_DIST = vlc_win32_rc.rc.in
|
|
--
|
|
2.47.3
|
|
|