summaryrefslogtreecommitdiffstats
path: root/0002-Fix-346-always-generates-lexbor.pc-347.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-03-27 08:04:39 +0100
committerRemi Collet <remi@php.net>2026-03-27 08:04:39 +0100
commitcc4c0d77cc6da3e5318403bd073c5ff5206c7f66 (patch)
tree4ca611d456bd33ee0f012423b585517ef0c7d744 /0002-Fix-346-always-generates-lexbor.pc-347.patch
parente26c78f0cbe8e415203d8bb543f1a20bfcf9db4d (diff)
improved pkg-config patch (merged upstream)HEADmaster
Diffstat (limited to '0002-Fix-346-always-generates-lexbor.pc-347.patch')
-rw-r--r--0002-Fix-346-always-generates-lexbor.pc-347.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/0002-Fix-346-always-generates-lexbor.pc-347.patch b/0002-Fix-346-always-generates-lexbor.pc-347.patch
new file mode 100644
index 0000000..feb2dc1
--- /dev/null
+++ b/0002-Fix-346-always-generates-lexbor.pc-347.patch
@@ -0,0 +1,44 @@
+From b8498c2c23a30772acb580da4d9cf3c793859516 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 26 Mar 2026 19:03:03 +0100
+Subject: [PATCH 2/2] Fix #346 always generates lexbor.pc (#347)
+
+---
+ CMakeLists.txt | 21 +++++++++------------
+ 1 file changed, 9 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eb3dcff..f794557 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -380,18 +380,15 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
+ ################
+ ## pkg-config configuration
+ #########################
+-find_package(PkgConfig)
+-if (PKG_CONFIG_FOUND)
+- configure_file(
+- "${PROJECT_SOURCE_DIR}/lexbor.pc.in"
+- "${PROJECT_BINARY_DIR}/lexbor.pc"
+- @ONLY
+- )
+- install(
+- FILES "${PROJECT_BINARY_DIR}/lexbor.pc"
+- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+- )
+-endif()
++configure_file(
++ "${PROJECT_SOURCE_DIR}/lexbor.pc.in"
++ "${PROJECT_BINARY_DIR}/lexbor.pc"
++ @ONLY
++)
++install(
++ FILES "${PROJECT_BINARY_DIR}/lexbor.pc"
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
++)
+
+ ################
+ ## Build an RPM.
+--
+2.53.0
+