diff options
Diffstat (limited to 'sci-libs/flann')
| -rw-r--r-- | sci-libs/flann/Manifest | 3 | ||||
| -rw-r--r-- | sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch | 38 | ||||
| -rw-r--r-- | sci-libs/flann/flann-1.9.1-r4.ebuild (renamed from sci-libs/flann/flann-1.9.1-r3.ebuild) | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/sci-libs/flann/Manifest b/sci-libs/flann/Manifest index ad8da00f85c3..8b2903604fb8 100644 --- a/sci-libs/flann/Manifest +++ b/sci-libs/flann/Manifest @@ -1,7 +1,8 @@ AUX flann-1.9.1-cmake-3.11-1.patch 663 BLAKE2B 7162cb27a4ba6e13ac6f65752224e53be4988b3bb2ab5b8a9afbbed69a262a36c394d445fbb006afe7edbc5c9e90c339a88040eb7bee4c5c6c3209e1ba21b4ef SHA512 6d5032c30c0509951aaa5afc3f24a423d275224f67e14e0c4defbbda92ec659cef86fcfa65d72265d000f8010f0117ca2b8905f2c6f496aeef74a98dee9ffa08 AUX flann-1.9.1-cmake-3.11.patch 2998 BLAKE2B 85c6b6feb800ab1a21af86a4001b0056fda416a6b61147f614670968cca13fa2b63d06673a11a2ef72b6f0d0876539ccb68134f4817975d4b796b66a716e606d SHA512 5cdffa2da3538965c0d20fb091a13124cdc301669b622ca35a131680db8abb58cf8e02f1366604a19a5cd10dd67f14861caa1c12da3154d82d576cb8052a4b87 AUX flann-1.9.1-cuda-9.patch 850 BLAKE2B f193a6fd25a1d2cd45201d547fb444393cb82f344da6f5d1e2a012599170a412b261f6cf35d8943da7e96fd9f204991580d5ea045b43e2aa33ea5ad9fa9307d4 SHA512 0b5cad7b928319b922bdaa27d07fd38f1c359799ef9c217b6c1979f8ac9a86706e7ad1547f484aeb1db449a37693d18b2710b877483266915a869372c29ee1e4 +AUX flann-1.9.1-system-lz4-pkgconfig.patch 1168 BLAKE2B 9fadff93a2d603aee3eadd72d28f5af4f41b63803aa7d878d9b23e30a9c2384d48f85d2c8be8cfcd47542b35e929b8f35afc70caf6dc6c676b6521ebc6f829d7 SHA512 ba1c6307f2504814adfc872f1cbcd4fdaab23c56d84427c11c20e3ff75263ac97be0813cf9c5e9acd1a945d0c5dbb2b7660ada3290ffc7332ea0c90b1bc26ffa AUX flann-1.9.1-system-lz4.patch 4934 BLAKE2B eea32abae8b13d5d0e5149c58b2639c1b6f3bbbedfa8aa91f5fb83afca4726571eb4e01eb440eb913b54f8a03124bc0266c8b039b6448bcdc0bc5e87a9512c6f SHA512 acb67eb59b400b82722f064e529fc86f43c4e16ba097a3742b5717b33fcd35a619c73ec6ea6391b23f906d4bc40a5167b56cffd0267bc2c8259b7298ad414e65 DIST flann-1.9.1.tar.gz 485391 BLAKE2B bf1e1e7feb33e939e1d0586db593bea3fdf66726fbadec63df9ed9c7bdb678babb11001769f0d041a7a569186b3d700db8b96af5eb9740615f6dfd880460f68b SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 -EBUILD flann-1.9.1-r3.ebuild 2320 BLAKE2B e3a8d2a4014e5bad7c20712aec3aa52c1334525830a408811923e63a22934a936ce9408ae26101c61cdba54edbc76e8f83d49631398a96c090a945a9b72f157c SHA512 a9143b97f949c83ccffbacac4da2215058372197cca49149d562bf9a8709acbcfe658e24d2c0532f71727c68c75c51ce432ddebfcd0afe98d7f003c6a9cd0c94 +EBUILD flann-1.9.1-r4.ebuild 2380 BLAKE2B ee30376d1c3a968a0a92ea5bfa9062db6773b087b5ee60517d1d9dde512d48b931a91fa83c9fef49a6eb4cf8e5117cc1f77085df1913fed3875d97a9edd02786 SHA512 8d18d6a7d8e6f3f5e0cce5b0d40b258768a59254f6d20e40256ec3d46cd5c304919623cd0ed109fd053f9a55552149d6a04e7f7b6184e31fa11473fb783af39b MISC metadata.xml 972 BLAKE2B b192aee4ab043f8c3f69526727aad60e2613a6b94c5b686404593ab40213afeacde74009d305fee83c6d670d50af59207ad95189a03c53fb8193abcfdfd69c97 SHA512 77b1bf0f269cd7bd63c06442cf2cd9d1405f2a40925da469a23827a1e2461e89b8ab1b80d202ead404e7fe25f9d24a91cc4b36d775349ddd9dd50168097d3db4 diff --git a/sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch b/sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch new file mode 100644 index 000000000000..35ea0d0e9841 --- /dev/null +++ b/sci-libs/flann/files/flann-1.9.1-system-lz4-pkgconfig.patch @@ -0,0 +1,38 @@ +https://github.com/flann-lib/flann/pull/480 + +https://bugs.gentoo.org/827263 +https://bugs.gentoo.org/829398 +https://bugs.gentoo.org/681898 + +From 25eb56ec78472bd419a121c6905095a793cf8992 Mon Sep 17 00:00:00 2001 +From: Mike Purvis <mpurvis@clearpath.ai> +Date: Fri, 9 Jul 2021 15:53:06 +0000 +Subject: [PATCH] Use string(JOIN) to avoid semicolons in pc file. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.12) + + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +@@ -148,6 +148,7 @@ endif(BUILD_CUDA_LIB) + + find_package(PkgConfig REQUIRED) + pkg_check_modules(LZ4 REQUIRED liblz4) ++string(JOIN " " LZ4_STATIC_LDFLAGS_STR ${LZ4_STATIC_LDFLAGS}) + + #set the C/C++ include path to the "include" directory + include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) +--- a/cmake/flann.pc.in ++++ b/cmake/flann.pc.in +@@ -8,6 +8,6 @@ Name: @PROJECT_NAME@ + Description: @PKG_DESC@ + Version: @FLANN_VERSION@ + Requires: @PKG_EXTERNAL_DEPS@ +-Libs: -L${libdir} @LZ4_STATIC_LDFLAGS@ -lflann -lflann_cpp ++Libs: -L${libdir} @LZ4_STATIC_LDFLAGS_STR@ -lflann -lflann_cpp + Cflags: -I${includedir} + + diff --git a/sci-libs/flann/flann-1.9.1-r3.ebuild b/sci-libs/flann/flann-1.9.1-r4.ebuild index e53d428ee73c..299876df8ad3 100644 --- a/sci-libs/flann/flann-1.9.1-r3.ebuild +++ b/sci-libs/flann/flann-1.9.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}"/${P}-cmake-3.11{,-1}.patch # bug 678030 "${FILESDIR}"/${P}-cuda-9.patch "${FILESDIR}"/${P}-system-lz4.patch # bug 681898 + "${FILESDIR}"/${P}-system-lz4-pkgconfig.patch # bug 827263 ) pkg_pretend() { |