diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-03 16:06:25 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-06-11 22:19:10 +0200 |
| commit | 6e5e22032193c81fd1231a772062ceac9f1b81d1 (patch) | |
| tree | 476295d1a806fd916aef48ab78856a08646161e6 /dev-cpp/gflags/files/gflags-2.1.1-libs.patch | |
| parent | 7ebd90f84b9832fdf66413ee05e424e50f7a80ea (diff) | |
| download | gentoo-6e5e22032193c81fd1231a772062ceac9f1b81d1.tar.gz gentoo-6e5e22032193c81fd1231a772062ceac9f1b81d1.tar.bz2 gentoo-6e5e22032193c81fd1231a772062ceac9f1b81d1.zip | |
dev-cpp/gflags: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'dev-cpp/gflags/files/gflags-2.1.1-libs.patch')
| -rw-r--r-- | dev-cpp/gflags/files/gflags-2.1.1-libs.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/dev-cpp/gflags/files/gflags-2.1.1-libs.patch b/dev-cpp/gflags/files/gflags-2.1.1-libs.patch deleted file mode 100644 index 0e59cb937e14..000000000000 --- a/dev-cpp/gflags/files/gflags-2.1.1-libs.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17d38b4..ca2c1df 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,8 @@ version_numbers ( - PACKAGE_VERSION_PATCH - ) - -+set (PACKAGE_SOVERSION "${PACKAGE_VERSION_MAJOR}") -+ - # ---------------------------------------------------------------------------- - # options - set (GFLAGS_NAMESPACE "${PACKAGE_NAME}" CACHE STRING "C++ namespace identifier of gflags library.") -@@ -256,7 +258,9 @@ foreach (TYPE IN ITEMS STATIC SHARED) - endif () - set_target_properties ( - gflags${opts}-${type} PROPERTIES COMPILE_DEFINITIONS "${defines}" -- OUTPUT_NAME "gflags${opts}" -+ OUTPUT_NAME "gflags${opts}" -+ VERSION "${PACKAGE_VERSION}" -+ SOVERSION "${PACKAGE_SOVERSION}" - ) - if (HAVE_SHLWAPI_H) - target_link_libraries (gflags${opts}-${type} shlwapi.lib) -@@ -280,9 +284,18 @@ if (OS_WINDOWS) - set (CONFIG_INSTALL_DIR CMake) - else () - set (RUNTIME_INSTALL_DIR bin) -- set (LIBRARY_INSTALL_DIR lib) -+ # The LIB_INSTALL_DIR and LIB_SUFFIX variables are used by the Fedora -+ # package maintainers. Also package maintainers of other distribution -+ # packages need to be able to specify the name of the library directory. -+ if (NOT LIB_INSTALL_DIR) -+ set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}") -+ endif () -+ set (LIBRARY_INSTALL_DIR "${LIB_INSTALL_DIR}" -+ CACHE PATH "Directory of installed libraries, e.g., \"lib64\"" -+ ) -+ mark_as_advanced (LIBRARY_INSTALL_DIR) - set (INCLUDE_INSTALL_DIR include) -- set (CONFIG_INSTALL_DIR lib/cmake/${PACKAGE_NAME}) -+ set (CONFIG_INSTALL_DIR ${LIBRARY_INSTALL_DIR}/cmake/${PACKAGE_NAME}) - endif () - - file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") |
