diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-16 11:00:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-16 11:00:10 +0100 |
| commit | 3c490942d0d98701d1c0971e60911fa6bd3ecb76 (patch) | |
| tree | c7e992463fec552ae6483d7b81848aa185d3559f /dev-libs/libpsl-native/files | |
| parent | c748acf4192a1e08c9feb2d5f0004937a4869639 (diff) | |
gentoo auto-resync : 16:09:2023 - 11:00:10
Diffstat (limited to 'dev-libs/libpsl-native/files')
| -rw-r--r-- | dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch | 36 | ||||
| -rw-r--r-- | dev-libs/libpsl-native/files/libpsl-native-7.3.2-test-cmake.patch | 18 |
2 files changed, 54 insertions, 0 deletions
diff --git a/dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch b/dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch new file mode 100644 index 000000000000..a8222f074713 --- /dev/null +++ b/dev-libs/libpsl-native/files/libpsl-native-7.3.2-cmake.patch @@ -0,0 +1,36 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,7 @@ + cmake_minimum_required(VERSION 2.8.11) + project(PSL-NATIVE) + +-# Can't use add_compile_options with 2.8.11 +-set(CMAKE_BUILD_TYPE "Release") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fstack-protector-strong -fpie -DFORTIFY_SOURCE=2 -O2") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro,-z,now") +@@ -11,15 +9,11 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl") + endif() + +-set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../powershell-unix") ++option(TESTING "Enable tests" OFF) + +-if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") +- message(STATUS "Building for ARM, no tests") +- add_subdirectory(src) +-else () +- # test in BUILD_DIR +- message(STATUS "Tests enabled") +- enable_testing() +- add_subdirectory(src) +- add_subdirectory(test) +-endif () ++add_subdirectory(src) ++ ++if(TESTING) ++ enable_testing() ++ add_subdirectory(test) ++endif() diff --git a/dev-libs/libpsl-native/files/libpsl-native-7.3.2-test-cmake.patch b/dev-libs/libpsl-native/files/libpsl-native-7.3.2-test-cmake.patch new file mode 100644 index 000000000000..641a4aaf4ee2 --- /dev/null +++ b/dev-libs/libpsl-native/files/libpsl-native-7.3.2-test-cmake.patch @@ -0,0 +1,18 @@ +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_subdirectory(googletest) ++find_package(GTest REQUIRED) + + add_executable(psl-native-test + test-getfileowner.cpp +@@ -19,9 +19,6 @@ add_executable(psl-native-test + test-createhardlink.cpp + main.cpp) + +-# manually include gtest headers +-target_include_directories(psl-native-test PRIVATE ${gtest_SOURCE_DIR}/include) +- + target_link_libraries(psl-native-test psl-native gtest) + + add_test(NAME psl-native-test |