From ba9d6009cc9a161503f286c8f666af02c27d510d Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 15 Oct 2024 11:58:23 +0200 Subject: [PATCH] Patch libmemcached (required as of 1.1.4) --- .github/workflows/libmemcached.yml | 2 + patches/libmemcached.patch | 75 ++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 patches/libmemcached.patch diff --git a/.github/workflows/libmemcached.yml b/.github/workflows/libmemcached.yml index 5f6f9b9..383b014 100644 --- a/.github/workflows/libmemcached.yml +++ b/.github/workflows/libmemcached.yml @@ -32,6 +32,8 @@ jobs: path: libmemcached repository: awesomized/libmemcached ref: ${{github.event.inputs.version}} + - name: Patch libmemcached + run: cd libmemcached && git apply --ignore-whitespace ..\winlib-builder\patches\libmemcached.patch - name: Compute virtual inputs id: virtuals run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}} diff --git a/patches/libmemcached.patch b/patches/libmemcached.patch new file mode 100644 index 0000000..65cc4d8 --- /dev/null +++ b/patches/libmemcached.patch @@ -0,0 +1,75 @@ + src/libhashkit/CMakeLists.txt | 4 ++-- + src/libmemcached/CMakeLists.txt | 6 +++--- + src/libmemcachedprotocol/CMakeLists.txt | 4 ++-- + src/libmemcachedutil/CMakeLists.txt | 4 ++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt +index 455570af..9ed0a3ac 100644 +--- a/src/libhashkit/CMakeLists.txt ++++ b/src/libhashkit/CMakeLists.txt +@@ -25,8 +25,8 @@ add_library(libhashkit) + add_library(hashkit ALIAS libhashkit) + set_target_properties(libhashkit PROPERTIES + CXX_STANDARD ${CXX_STANDARD} +- OUTPUT_NAME hashkit +- OUTPUT_NAME_DEBUG hashkit-dbg ++ LIBRARY_OUTPUT_NAME hashkit ++ LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg + SOVERSION ${LIBHASHKIT_SO_SOVERSION} + VERSION ${LIBHASHKIT_SO_VERSION}) + target_compile_options(libhashkit PRIVATE -DBUILDING_HASHKIT) +diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt +index 05116ae8..075a6308 100644 +--- a/src/libmemcached/CMakeLists.txt ++++ b/src/libmemcached/CMakeLists.txt +@@ -89,8 +89,8 @@ add_library(libmemcached) + add_library(memcached ALIAS libmemcached) + set_target_properties(libmemcached PROPERTIES + CXX_STANDARD ${CXX_STANDARD} +- OUTPUT_NAME memcached +- OUTPUT_NAME_DEBUG memcached-dbg ++ LIBRARY_OUTPUT_NAME memcached ++ LIBRARY_OUTPUT_NAME_DEBUG memcached-dbg + SOVERSION ${LIBMEMCACHED_SO_SOVERSION} + VERSION ${LIBMEMCACHED_SO_VERSION}) + target_compile_definitions(libmemcached PRIVATE -DBUILDING_LIBMEMCACHED) +@@ -147,7 +147,7 @@ target_sources(libmemcached PRIVATE + + add_library(libmemcachedinternal STATIC) + add_library(memcachedinternal ALIAS libmemcachedinternal) +-set_target_properties(libmemcachedinternal PROPERTIES CXX_STANDARD ${CXX_STANDARD} OUTPUT_NAME memcachedinternal) ++set_target_properties(libmemcachedinternal PROPERTIES CXX_STANDARD ${CXX_STANDARD} LIBRARY_OUTPUT_NAME memcachedinternal) + target_compile_definitions(libmemcachedinternal PRIVATE -DBUILDING_LIBMEMCACHEDINTERNAL) + target_link_libraries(libmemcachedinternal PUBLIC libhashkit Threads::Threads ${CMAKE_DL_LIBS}) + target_link_libraries(libmemcachedinternal PRIVATE p9y) +diff --git a/src/libmemcachedprotocol/CMakeLists.txt b/src/libmemcachedprotocol/CMakeLists.txt +index c213e270..a32f264b 100644 +--- a/src/libmemcachedprotocol/CMakeLists.txt ++++ b/src/libmemcachedprotocol/CMakeLists.txt +@@ -13,8 +13,8 @@ add_library(libmemcachedprotocol) + add_library(memcachedprotocol ALIAS libmemcachedprotocol) + set_target_properties(libmemcachedprotocol PROPERTIES + CXX_STANDARD ${CXX_STANDARD} +- OUTPUT_NAME memcachedprotocol +- OUTPUT_NAME_DEBUG memcachedprotocol-dbg ++ LIBRARY_OUTPUT_NAME memcachedprotocol ++ LIBRARY_OUTPUT_NAME_DEBUG memcachedprotocol-dbg + SOVERSION ${LIBMEMCACHEDPROTOCOL_SO_SOVERSION} + VERSION ${LIBMEMCACHEDPROTOCOL_SO_VERSION}) + target_compile_definitions(libmemcachedprotocol PRIVATE -DBUILDING_LIBMEMCACHED) +diff --git a/src/libmemcachedutil/CMakeLists.txt b/src/libmemcachedutil/CMakeLists.txt +index 1fd0fa39..51fb79e3 100644 +--- a/src/libmemcachedutil/CMakeLists.txt ++++ b/src/libmemcachedutil/CMakeLists.txt +@@ -13,8 +13,8 @@ if(CMAKE_USE_PTHREADS_INIT) + endif() + set_target_properties(libmemcachedutil PROPERTIES + CXX_STANDARD ${CXX_STANDARD} +- OUTPUT_NAME memcachedutil +- OUTPUT_NAME_DEBUG memcachedutil-dbg ++ LIBRARY_OUTPUT_NAME memcachedutil ++ LIBRARY_OUTPUT_NAME_DEBUG memcachedutil-dbg + SOVERSION ${LIBMEMCACHEDUTIL_SO_SOVERSION} + VERSION ${LIBMEMCACHEDUTIL_SO_VERSION}) + target_compile_definitions(libmemcachedutil PRIVATE -DBUILDING_LIBMEMCACHED)