Skip to contentSkip to conversation

package/openjpeg: fix static library install

PATCH New Bernd Kuhls 3 participants 3 messages Nov 1, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/openjpeg: fix static library install

Fixes
http://autobuild.buildroot.net/results/c35/c35599e6bf09aebe456ea959d7c238f82090fc62/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/openjpeg/0004-install-static-lib.patch | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/openjpeg/0004-install-static-lib.patch
package/openjpeg/0004-install-static-lib.patch new file +27 -0
new file mode 100644
index 0000000000..4a3bbfa28a
@@ -0,0 +1,27 @@
+From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
+From: Even Rouault <[email protected]>
+Date: Mon, 9 Oct 2017 11:40:43 +0200
+Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
+ static-only build lacks the installation target for the library (#1019, fixes
+ regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
+
+Downloaded from upstream commit
+https://github.com/uclouvain/openjpeg/commit/66297f07a43d2770a97c8456d20202f3d051d980
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ src/lib/openjp2/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
+index 0b4520384..f8990ccf0 100644
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -99,6 +99,7 @@ else()
+     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
+   else()
+     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
+   endif()
+ endif()
+
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/openjpeg: fix static library install

Acked-by Olivier Schonken <[email protected]>
Quoted 50 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/c35/c35599e6bf09aebe456ea959d7c238
f82090fc62/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/openjpeg/0004-install-static-lib.patch | 27
++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/openjpeg/0004-install-static-lib.patch
package/openjpeg/0004-install-static-lib.patch new file +4 -0
new file mode 100644
index 0000000000..4a3bbfa28a
@@ -0,0 +1,27 @@
+From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
+From: Even Rouault <[email protected]>
+Date: Mon, 9 Oct 2017 11:40:43 +0200
+Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only

or
+ static-only build lacks the installation target for the library (#1019, fixes
+ regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)

package/openjpeg/0004-install-static-lib.patch new file +3 -0
+
+Downloaded from upstream commit
+https://github.com/uclouvain/openjpeg/commit/

66297f07a43d2770a97c8456d20202f3d051d980

package/openjpeg/0004-install-static-lib.patch new file +7 -0
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ src/lib/openjp2/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.

txt

package/openjpeg/0004-install-static-lib.patch new file +11 -1
+index 0b4520384..f8990ccf0 100644
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -99,6 +99,7 @@ else()
+     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
+   else()
+     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
+   endif()
+ endif()
+
--
Quoted 3 lines

2.11.0

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20171101/e67f7f3c/attachment.html>

Applied
#2 lore raw

PATCH 1/1 package/openjpeg: fix static library install

In reply to Bernd Kuhls

Hello,

Quoted 8 lines · Bernd Kuhls

Fixes
http://autobuild.buildroot.net/results/c35/c35599e6bf09aebe456ea959d7c238f82090fc62/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/openjpeg/0004-install-static-lib.patch | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 package/openjpeg/0004-install-static-lib.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com