diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /dev-libs/tlsh/files | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'dev-libs/tlsh/files')
| -rw-r--r-- | dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch | 37 | ||||
| -rw-r--r-- | dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch | 21 |
2 files changed, 58 insertions, 0 deletions
diff --git a/dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch b/dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch new file mode 100644 index 000000000000..d30363de6d74 --- /dev/null +++ b/dev-libs/tlsh/files/tlsh-4.8.2-gnuinstalldirs.patch @@ -0,0 +1,37 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ + # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # OF THE POSSIBILITY OF SUCH DAMAGE. + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 2.8.5) + + project(TLSH) + +@@ -133,6 +133,8 @@ else(CMAKE_BUILD_TYPE STREQUAL Debug) + endif() + endif(CMAKE_BUILD_TYPE STREQUAL Debug) + ++include(GNUInstallDirs) ++ + if(MSVC) + add_definitions(-DWINDOWS -DTLSH_LIB) + include_directories(Windows) +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -78,10 +78,10 @@ if(TLSH_SHARED_LIBRARY EQUAL 1) + endif() + + if(TLSH_SHARED_LIBRARY) +- install(TARGETS tlsh_static tlsh_shared DESTINATION lib) ++ install(TARGETS tlsh_static tlsh_shared DESTINATION ${CMAKE_INSTALL_LIBDIR}) + else() +- install(TARGETS tlsh_static DESTINATION lib) ++ install(TARGETS tlsh_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + +-install(FILES ../include/tlsh.h DESTINATION include/tlsh) +-install(FILES ../include/tlsh_version.h DESTINATION include/tlsh) ++install(FILES ../include/tlsh.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tlsh) ++install(FILES ../include/tlsh_version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tlsh) diff --git a/dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch b/dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch new file mode 100644 index 000000000000..fc22b9a1d521 --- /dev/null +++ b/dev-libs/tlsh/files/tlsh-4.8.2-respect-flags.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,7 +126,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug) + endif() + else(CMAKE_BUILD_TYPE STREQUAL Debug) + if(CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_CXX_FLAGS "-O2 -fvisibility=internal") ## Remove TlshImpl symbols ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=internal") ## Remove TlshImpl symbols + endif() + if(MSVC) + set(CMAKE_CXX_FLAGS "/O2") ## Optimize +@@ -142,8 +142,7 @@ endif() + + # user can override CXX; make sure tests link and load properly regardless of LD_LIBRARY_PATH + if(CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc") +- set(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++") + endif() + + enable_testing() |