From 99b33a49a21115caa87219b06e15d621e02037272f85f565e4531c193d3d7564 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 21 Jun 2024 06:09:57 +0000 Subject: [PATCH] - Update lib-suffix.patch * Add LIB_SUFFIX to libdir path in the pkg-config file OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=126 --- lib-suffix.patch | 23 ++++++++++++++++------- libarchive.changes | 6 ++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/lib-suffix.patch b/lib-suffix.patch index aed7e43..7d3769e 100644 --- a/lib-suffix.patch +++ b/lib-suffix.patch @@ -1,8 +1,8 @@ -Index: libarchive-3.7.0/libarchive/CMakeLists.txt +Index: b/libarchive/CMakeLists.txt =================================================================== ---- libarchive-3.7.0.orig/libarchive/CMakeLists.txt -+++ libarchive-3.7.0/libarchive/CMakeLists.txt -@@ -265,13 +265,13 @@ IF(ENABLE_INSTALL) +--- a/libarchive/CMakeLists.txt ++++ b/libarchive/CMakeLists.txt +@@ -266,13 +266,13 @@ IF(ENABLE_INSTALL) IF(BUILD_SHARED_LIBS) INSTALL(TARGETS archive RUNTIME DESTINATION bin @@ -20,10 +20,19 @@ Index: libarchive-3.7.0/libarchive/CMakeLists.txt INSTALL_MAN(${libarchive_MANS}) INSTALL(FILES ${include_HEADERS} DESTINATION include) ENDIF() -Index: libarchive-3.7.0/build/cmake/CreatePkgConfigFile.cmake +Index: b/build/cmake/CreatePkgConfigFile.cmake =================================================================== ---- libarchive-3.7.0.orig/build/cmake/CreatePkgConfigFile.cmake -+++ libarchive-3.7.0/build/cmake/CreatePkgConfigFile.cmake +--- a/build/cmake/CreatePkgConfigFile.cmake ++++ b/build/cmake/CreatePkgConfigFile.cmake +@@ -4,7 +4,7 @@ + # Set the required variables (we use the same input file as autotools) + SET(prefix ${CMAKE_INSTALL_PREFIX}) + SET(exec_prefix \${prefix}) +-SET(libdir \${exec_prefix}/lib) ++SET(libdir \${exec_prefix}/lib${LIB_SUFFIX}) + SET(includedir \${prefix}/include) + # Now, this is not particularly pretty, nor is it terribly accurate... + # Loop over all our additional libs @@ -29,5 +29,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI # And install it, of course ;). IF(ENABLE_INSTALL) diff --git a/libarchive.changes b/libarchive.changes index 08de6b8..943ded8 100644 --- a/libarchive.changes +++ b/libarchive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 20 14:56:58 UTC 2024 - Antonio Teixeira + +- Update lib-suffix.patch + * Add LIB_SUFFIX to libdir path in the pkg-config file + ------------------------------------------------------------------- Wed May 22 08:32:02 UTC 2024 - Danilo Spinella