Skip to contentSkip to conversation

libcue: add patch to fix BR2_STATIC_LIBS=y builds

PATCH New Thomas Petazzoni 1 participant 2 messages May 1, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libcue: add patch to fix BR2_STATIC_LIBS=y builds

Fixes:

http://autobuild.buildroot.net/results/02712e85db8e538045497e9242b476c040198f1d/

---
 ...txt-don-t-force-SHARED-when-building-the-.patch | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 package/libcue/0002-CMakeLists.txt-don-t-force-SHARED-when-building-the-.patch
package/libcue/0002-CMakeLists.txt-don-t-force-SHARED-when-building-the-.patch new file +41 -0
new file mode 100644
index 0000000000..4071572f21
@@ -0,0 +1,41 @@
+From 4d0d29482c2116cfd39a5884061648a6b416cb76 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <[email protected]>
+Date: Tue, 1 May 2018 22:04:51 +0200
+Subject: [PATCH] CMakeLists.txt: don't force SHARED when building the library
+
+According to the CMake documentation [1]:
+
+   If no type is given explicitly the type is STATIC or SHARED based
+   on whether the current value of the variable BUILD_SHARED_LIBS is
+   ON.
+
+The CMakeLists.txt currently forces "SHARED", which prevents
+static-only builds from working. By removing this "SHARED" statement,
+we let CMake decide whether a static or shared library should be
+built, depending on the value of the standard variable
+BUILD_SHARED_LIBS.
+
+[1] https://cmake.org/cmake/help/v3.0/command/add_library.html
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+Upstream-status: https://github.com/lipnitsk/libcue/pull/18
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1e4ca25..adacc45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,7 @@ FLEX_TARGET(CueScanner
+ 	${CMAKE_BINARY_DIR}/cue_scanner.c)
+ ADD_FLEX_BISON_DEPENDENCY(CueScanner CueParser)
+ 
+-ADD_LIBRARY(cue SHARED ${CUE_SOURCES}
++ADD_LIBRARY(cue ${CUE_SOURCES}
+ 	${BISON_CueParser_OUTPUTS}
+ 	${FLEX_CueScanner_OUTPUTS})
+ 
+-- 
+2.14.3
+
Signature · 1 line
2.14.3
#1 lore raw

PATCH 2/2 libcue: add upstream status to 0001-libcue-is-only-implemented-in-C.patch

The patch 0001-libcue-is-only-implemented-in-C.patch has been submitted upstream by Fabrice, let's put the link to the pull request in the patch itself.

---
 package/libcue/0001-libcue-is-only-implemented-in-C.patch | 1 +
 1 file changed, 1 insertion(+)
package/libcue/0001-libcue-is-only-implemented-in-C.patch +1 -0
index bb36172ad1..70d38baa0c 100644
@@ -12,6 +12,7 @@ Fixes:
  - http://autobuild.buildroot.net/results/a5344d18dbdc86705853fbf8a66d5304de07a9b2
 
 Signed-off-by: Fabrice Fontaine <[email protected]>
+Upstream-status: https://github.com/lipnitsk/libcue/pull/17
 ---
  CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.14.3