diff options
| author | Jason Zaman <perfinion@gentoo.org> | 2019-04-14 16:52:34 +0800 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2019-04-15 00:27:18 +0800 |
| commit | 4bcc694c0c386f221bd5ac2c8e1497f4f4c6053a (patch) | |
| tree | 903674c2ee555ec947d2a0e070a2b6105b176276 /dev-libs/double-conversion/files | |
| parent | 106c26f9a93a0c86346a3ef378ee62ec15bc89d1 (diff) | |
| download | gentoo-4bcc694c0c386f221bd5ac2c8e1497f4f4c6053a.tar.gz gentoo-4bcc694c0c386f221bd5ac2c8e1497f4f4c6053a.tar.xz | |
dev-libs/double-conversion: bump to 3.1.4
Signed-off-by: Jason Zaman <perfinion@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Diffstat (limited to 'dev-libs/double-conversion/files')
| -rw-r--r-- | dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch new file mode 100644 index 00000000000..3dbbfafec11 --- /dev/null +++ b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch @@ -0,0 +1,63 @@ +From 0d65c903c600d983eabfa5be793fa60c346d8303 Mon Sep 17 00:00:00 2001 +From: Jason Zaman <jason@perfinion.com> +Date: Sun, 14 Apr 2019 16:38:10 +0800 +Subject: [PATCH] CMake: install to correct lib dir + +64-bit libraries should be installed in /usr/lib64, not in /usr/lib/ +Make the destination lib dir configurable. + +Commit e13e72e17692f5dc0036460d734c637b563f3ac7 removed +include(GNUInstallDirs) and ${CMAKE_INSTALL_LIBDIR} which broke +installing on 64-bit systems. + +Signed-off-by: Jason Zaman <jason@perfinion.com> +--- + CMakeLists.txt | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9f4be8..2a06c71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,12 +40,13 @@ endif() + #### + # Installation (https://github.com/forexample/package-example) + ++include(GNUInstallDirs) ++ + # Layout. This works for all platforms: + # * <prefix>/lib/cmake/<PROJECT-NAME> + # * <prefix>/lib/ + # * <prefix>/include/ +-set(config_install_dir "lib/cmake/${PROJECT_NAME}") +-set(include_install_dir "include") ++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") + +@@ -81,17 +82,17 @@ configure_package_config_file( + install( + TARGETS double-conversion + EXPORT "${targets_export_name}" +- LIBRARY DESTINATION "lib" +- ARCHIVE DESTINATION "lib" +- RUNTIME DESTINATION "bin" +- INCLUDES DESTINATION "${include_install_dir}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ) + + # Headers: + # * double-conversion/*.h -> <prefix>/include/double-conversion/*.h + install( + FILES ${headers} +- DESTINATION "${include_install_dir}/double-conversion" ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/double-conversion" + ) + + # Config +-- +2.21.0 + |