| 1 |
commit: f23b2debadee5ddc67ce8fdacf1470fa546319e2 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 8 08:56:28 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 8 08:56:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23b2deb |
| 7 |
|
| 8 |
sci-libs/liborigin: no static libs |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/828534 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> |
| 13 |
|
| 14 |
.../liborigin-3.0.1_p20210828-buildsystem.patch | 24 +++++++++++++++------- |
| 15 |
....ebuild => liborigin-3.0.1_p20210828-r1.ebuild} | 0 |
| 16 |
2 files changed, 17 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch |
| 19 |
index 8ad6fd432abe..150ae4e21be1 100644 |
| 20 |
--- a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch |
| 21 |
+++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 24 |
-index a8e5914..6401a30 100644 |
| 25 |
+index a8e5914..a1a129c 100644 |
| 26 |
--- a/CMakeLists.txt |
| 27 |
+++ b/CMakeLists.txt |
| 28 |
@@ -41,7 +41,6 @@ set (devel-headers |
| 29 |
@@ -10,15 +10,21 @@ index a8e5914..6401a30 100644 |
| 30 |
) |
| 31 |
|
| 32 |
# allow for installation of individual targets |
| 33 |
-@@ -65,6 +64,7 @@ add_library (origin_static STATIC $<TARGET_OBJECTS:origin>) |
| 34 |
- set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" ) |
| 35 |
+@@ -59,12 +58,8 @@ else() |
| 36 |
+ message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.") |
| 37 |
+ endif () |
| 38 |
|
| 39 |
+-# Static library |
| 40 |
+-add_library (origin_static STATIC $<TARGET_OBJECTS:origin>) |
| 41 |
+- |
| 42 |
+-set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" ) |
| 43 |
+- |
| 44 |
if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) |
| 45 |
+ include(GNUInstallDirs) |
| 46 |
|
| 47 |
# Shared library |
| 48 |
add_library( origin_shared SHARED $<TARGET_OBJECTS:origin>) |
| 49 |
-@@ -74,13 +74,14 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) |
| 50 |
+@@ -74,15 +69,16 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) |
| 51 |
SOVERSION ${PROJECT_VERSION_MAJOR} |
| 52 |
) |
| 53 |
# Generate a pkg-config file matching this config |
| 54 |
@@ -28,14 +34,18 @@ index a8e5914..6401a30 100644 |
| 55 |
+ if(ENABLE_TOOLS) |
| 56 |
# command line util |
| 57 |
add_executable(opj2dat opj2dat.cpp) |
| 58 |
- target_link_libraries (opj2dat origin_static) |
| 59 |
+- target_link_libraries (opj2dat origin_static) |
| 60 |
++ target_link_libraries (opj2dat origin_shared) |
| 61 |
+ endif () |
| 62 |
|
| 63 |
- include(GNUInstallDirs) |
| 64 |
# install libraries |
| 65 |
- install( TARGETS origin_shared origin_static |
| 66 |
+- install( TARGETS origin_shared origin_static |
| 67 |
++ install( TARGETS origin_shared |
| 68 |
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} |
| 69 |
-@@ -92,7 +93,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) |
| 70 |
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 71 |
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| 72 |
+@@ -92,7 +88,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" ) |
| 73 |
# install pkg-config file |
| 74 |
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
| 75 |
# |
| 76 |
|
| 77 |
diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild |
| 78 |
similarity index 100% |
| 79 |
rename from sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild |
| 80 |
rename to sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild |
Archives