* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pugixml/, dev-libs/pugixml/files/
@ 2019-01-09 0:17 Craig Andrews
0 siblings, 0 replies; 2+ messages in thread
From: Craig Andrews @ 2019-01-09 0:17 UTC (permalink / raw
To: gentoo-commits
commit: a8750e4306082f537d9b44d1b9b6b2c9aad503bc
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 21:32:02 2019 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 00:17:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8750e43
dev-libs/pugixml: Install pkg-config, EAPI=7
Closes: https://bugs.gentoo.org/674910
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
...9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch | 39 ++++++++++++
...ml-1.9-always-install-the-pkg-config-file.patch | 71 ++++++++++++++++++++++
...config-Use-CMake-GnuInstallDirs-FULL-vars.patch | 39 ++++++++++++
dev-libs/pugixml/pugixml-1.9-r1.ebuild | 33 ++++++++++
4 files changed, 182 insertions(+)
diff --git a/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch b/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch
new file mode 100644
index 00000000000..18928e39cd6
--- /dev/null
+++ b/dev-libs/pugixml/files/pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch
@@ -0,0 +1,39 @@
+From c12889f7ccee3a91754f12a4f5b2bf5eb87acabd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
+Date: Wed, 27 Jun 2018 00:53:42 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for pugixml.pc (#215)
+
+- Up to now, the libdir was hardcoded to "lib" inside pugixml.pc and
+ the install directory of pugixml.pc was "lib/pkgconfig"
+- Adds support for lib and lib64 by using CMAKE_INSTALL_LIBDIR variable
+---
+ CMakeLists.txt | 2 +-
+ scripts/pugixml.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 148f7b0d..d322a631 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+
+ configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+-install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ if(BUILD_TESTS)
+ file(GLOB TEST_SOURCES tests/*.cpp)
+diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
+index 04b4d3b0..fbb7f8b8 100644
+--- a/scripts/pugixml.pc.in
++++ b/scripts/pugixml.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ includedir=${prefix}/include@INSTALL_SUFFIX@
+-libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@
+
+ Name: pugixml
+ Description: Light-weight, simple and fast XML parser for C++ with XPath support.
diff --git a/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch b/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch
new file mode 100644
index 00000000000..4551280b372
--- /dev/null
+++ b/dev-libs/pugixml/files/pugixml-1.9-always-install-the-pkg-config-file.patch
@@ -0,0 +1,71 @@
+From daeb8013b20f9c47e85730faaa4131064a1f9c2e Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 9 Apr 2018 13:48:53 -0400
+Subject: [PATCH] cmake: always install the pkg-config file (#193)
+
+There's really never a reason to *not* want this installed. If an option
+is needed to specify installing in a versioned subdirectory, this option
+should be explicitly described rather than hidden in something else.
+
+As an added bonus, this makes the CMake install code slightly *less*
+complicated.
+---
+ CMakeLists.txt | 10 ++++------
+ scripts/pugixml.pc.in | 6 +++---
+ 2 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90fa6793..d7bc1b20 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@ project(pugixml)
+
+ option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
+ option(BUILD_TESTS "Build tests" OFF)
+-option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
++option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the headers and libs" OFF)
+
+ set(BUILD_DEFINES "" CACHE STRING "Build defines")
+
+@@ -55,7 +55,7 @@ endif()
+ set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
+ get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
+
+-if(BUILD_PKGCONFIG)
++if(USE_VERSIONED_LIBDIR)
+ # Install library into its own directory under LIBDIR
+ set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
+ endif()
+@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config
+ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+
+-if(BUILD_PKGCONFIG)
+- configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+- install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+-endif()
++configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+
+ if(BUILD_TESTS)
+ file(GLOB TEST_SOURCES tests/*.cpp)
+diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
+index 3c97c28d..804c4d38 100644
+--- a/scripts/pugixml.pc.in
++++ b/scripts/pugixml.pc.in
+@@ -1,11 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@
+-libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@
++includedir=${prefix}/include@INSTALL_SUFFIX@
++libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
+
+ Name: pugixml
+ Description: Light-weight, simple and fast XML parser for C++ with XPath support.
+ URL: http://pugixml.org/
+ Version: @PUGIXML_VERSION_STRING@
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lpugixml
+\ No newline at end of file
++Libs: -L${libdir} -lpugixml
diff --git a/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch b/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch
new file mode 100644
index 00000000000..7a9b0c139cd
--- /dev/null
+++ b/dev-libs/pugixml/files/pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch
@@ -0,0 +1,39 @@
+From b3db08ffccb78d680d8f7665ad9ed4cff6f92fcf Mon Sep 17 00:00:00 2001
+From: Millian Poquet <millian.poquet@inria.fr>
+Date: Mon, 10 Dec 2018 18:54:40 +0100
+Subject: [PATCH] pkg-config: Use CMake GnuInstallDirs FULL vars
+
+Fixes an installation problem in Nix packages, as non-FULL variables are
+already absolute paths in this case.
+---
+ CMakeLists.txt | 2 +-
+ scripts/pugixml.pc.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ddc5a5ad..e8c4f592 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX
+ install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
+
+ configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
+-install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+
+ if(BUILD_TESTS)
+ file(GLOB TEST_SOURCES tests/*.cpp)
+diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
+index a1678272..f9c3fd45 100644
+--- a/scripts/pugixml.pc.in
++++ b/scripts/pugixml.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-includedir=${prefix}/include@INSTALL_SUFFIX@
+-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@@INSTALL_SUFFIX@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@@INSTALL_SUFFIX@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@@INSTALL_SUFFIX@
+
+ Name: pugixml
+ Description: Light-weight, simple and fast XML parser for C++ with XPath support.
diff --git a/dev-libs/pugixml/pugixml-1.9-r1.ebuild b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
new file mode 100644
index 00000000000..93ca3d73044
--- /dev/null
+++ b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/zeux/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
+HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}/${P}-always-install-the-pkg-config-file.patch"
+ "${FILESDIR}/${P}-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch"
+ "${FILESDIR}/${P}-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pugixml/, dev-libs/pugixml/files/
@ 2020-12-15 4:13 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-12-15 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 1aa1f008296d4b2ed9805b3767e943c86fa5ea60
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 04:13:44 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 04:13:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa1f008
dev-libs/pugixml: bump to 1.11.2
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pugixml/Manifest | 2 +-
.../files/pugixml-1.11.1-cmake-config.patch | 24 ----------------------
...ixml-1.11.1-r1.ebuild => pugixml-1.11.2.ebuild} | 0
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 46aaf2d3631..b5debf23fbd 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,2 +1,2 @@
DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
-DIST pugixml-1.11.1.tar.gz 386133 BLAKE2B d3a83a8be1b3e6605d7c9a6dcd48e4d467b44c2070238a01d1f0a511d2936a7a01efb26b080a4beceec7f02869e10392c3023c62d3e84eb94949ebefaceb73f9 SHA512 ab8da8744c4594a947d731a876717287892b64195d44d6e1c518bee5fb712a45b23ac763b12af0ad20c6f2cb74f6b1bae1a68fa90f786851aa6d3f139a32eda6
+DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d
diff --git a/dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch b/dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch
deleted file mode 100644
index 21718c29d4d..00000000000
--- a/dev-libs/pugixml/files/pugixml-1.11.1-cmake-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/zeux/pugixml/pull/389.patch
-https://bugs.gentoo.org/758611
-From 4feab60bb7ecced7cea18c570ca9a39a08246a57 Mon Sep 17 00:00:00 2001
-From: Ben Boeckel <ben.boeckel@kitware.com>
-Date: Thu, 10 Dec 2020 07:52:35 -0500
-Subject: [PATCH] cmake: avoid ALIAS target
-
-This is not allowed on IMPORTED targets.
----
- scripts/pugixml-config.cmake.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/pugixml-config.cmake.in b/scripts/pugixml-config.cmake.in
-index 5af37501..58be6391 100644
---- a/scripts/pugixml-config.cmake.in
-+++ b/scripts/pugixml-config.cmake.in
-@@ -6,5 +6,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/pugixml-targets.cmake")
- # version or not requesting one at all), provide the old imported target name
- # for compatibility.
- if (NOT DEFINED PACKAGE_FIND_VERSION OR PACKAGE_FIND_VERSION VERSION_LESS "1.11")
-- add_library(pugixml ALIAS pugixml::pugixml)
-+ add_library(pugixml INTERFACE IMPORTED)
-+ target_link_libraries(pugixml INTERFACE pugixml::pugixml)
- endif ()
diff --git a/dev-libs/pugixml/pugixml-1.11.1-r1.ebuild b/dev-libs/pugixml/pugixml-1.11.2.ebuild
similarity index 100%
rename from dev-libs/pugixml/pugixml-1.11.1-r1.ebuild
rename to dev-libs/pugixml/pugixml-1.11.2.ebuild
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-15 4:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-15 4:13 [gentoo-commits] repo/gentoo:master commit in: dev-libs/pugixml/, dev-libs/pugixml/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-01-09 0:17 Craig Andrews
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox