[gentoo-commits] repo/gentoo:master commit in: sci-libs/liborigin/, sci-libs/liborigin/files/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     f23b2debadee5ddc67ce8fdacf1470fa546319e2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  8 08:56:28 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec  8 08:56:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23b2deb

sci-libs/liborigin: no static libs

Closes: https://bugs.gentoo.org/828534
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../liborigin-3.0.1_p20210828-buildsystem.patch    | 24 +++++++++++++++-------
 ....ebuild => liborigin-3.0.1_p20210828-r1.ebuild} |  0
 2 files changed, 17 insertions(+), 7 deletions(-)

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
index 8ad6fd432abe..150ae4e21be1 100644
--- a/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
+++ b/sci-libs/liborigin/files/liborigin-3.0.1_p20210828-buildsystem.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a8e5914..6401a30 100644
+index a8e5914..a1a129c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -41,7 +41,6 @@ set (devel-headers
@@ -10,15 +10,21 @@ index a8e5914..6401a30 100644
  	)
  
  # allow for installation of individual targets
-@@ -65,6 +64,7 @@ add_library (origin_static STATIC $<TARGET_OBJECTS:origin>)
- set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
+@@ -59,12 +58,8 @@ else()
+     message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
+ endif ()
  
+-# Static library
+-add_library (origin_static STATIC $<TARGET_OBJECTS:origin>)
+-
+-set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
+-
  if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
 +  include(GNUInstallDirs)
  
    # Shared library
    add_library( origin_shared SHARED $<TARGET_OBJECTS:origin>)
-@@ -74,13 +74,14 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
+@@ -74,15 +69,16 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
  	SOVERSION ${PROJECT_VERSION_MAJOR}
      )
    # Generate a pkg-config file matching this config
@@ -28,14 +34,18 @@ index a8e5914..6401a30 100644
 +  if(ENABLE_TOOLS)
    # command line util
    add_executable(opj2dat opj2dat.cpp)
-   target_link_libraries (opj2dat origin_static)
+-  target_link_libraries (opj2dat origin_static)
++  target_link_libraries (opj2dat origin_shared)
 +  endif ()
    
 -  include(GNUInstallDirs)
    # install libraries
-   install( TARGETS origin_shared origin_static
+-  install( TARGETS origin_shared origin_static
++  install( TARGETS origin_shared
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -92,7 +93,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
+     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -92,7 +88,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
    # install pkg-config file
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
    #

diff --git a/sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild b/sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild
similarity index 100%
rename from sci-libs/liborigin/liborigin-3.0.1_p20210828.ebuild
rename to sci-libs/liborigin/liborigin-3.0.1_p20210828-r1.ebuild