diff options
| author | Holger Jaekel <holger.jaekel@gmx.de> | 2020-07-09 20:34:49 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-07-10 15:11:16 +0000 |
| commit | 3f521788825d9fc0989ed3b49496ce282765e534 (patch) | |
| tree | 96143bc3e5584b66175c98c5077a4df6db721e04 | |
| parent | 59c24d6f89b6ee0aa2e6a1ddf3a8371f686de8fc (diff) | |
community/proj: upgrade to 7.1.0
| -rw-r--r-- | community/proj/APKBUILD | 11 | ||||
| -rw-r--r-- | community/proj/fma.patch | 37 |
2 files changed, 45 insertions, 3 deletions
diff --git a/community/proj/APKBUILD b/community/proj/APKBUILD index 35cc99d87dd..e10724c4ec6 100644 --- a/community/proj/APKBUILD +++ b/community/proj/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=proj -pkgver=7.0.1 +pkgver=7.1.0 pkgrel=0 _datumgridver=1.8 pkgdesc="PROJ coordinate transformation software library" @@ -19,6 +19,7 @@ subpackages=" source=" http://download.osgeo.org/proj/proj-$pkgver.tar.gz http://download.osgeo.org/proj/proj-datumgrid-$_datumgridver.zip + fma.patch " unpack() { @@ -45,6 +46,9 @@ build() { } check() { + case "$CARCH" in + x86) sed -i "s/tolerance 3 mm/tolerance 10 mm/" test/gie/adams_ws2.gie ;; + esac CTEST_OUTPUT_ON_FAILURE=TRUE ctest --force-new-ctest-process } @@ -71,5 +75,6 @@ util() { mv "$pkgdir/usr/bin" "$subpkgdir/usr" } -sha512sums="034d1b916980c80fe9f8e67d2897814e611920af3e852f152fcd9e3fc4ec8cbc39bbd8f8296949a3c3f5e6708bb9d84e61c4cba9c01476a3888448135e97dc33 proj-7.0.1.tar.gz -991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1 proj-datumgrid-1.8.zip" +sha512sums="74c83c001442a2336479ab4cd627fdbf20182711f7d62acf325aaff66c32d10fdb33e1d81cff31cff1c56cb641a9d16f7701bf3e88b98401022acd059d4da28f proj-7.1.0.tar.gz +991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1 proj-datumgrid-1.8.zip +81f088973d27b51c1eb1fd7f89d28337a486bf2aeac52f360d3acae6bb172e748d2ddf6a4c4c6d3dc28778ed9507bc1c18d005a1b63631aabb465b4eb3032797 fma.patch" diff --git a/community/proj/fma.patch b/community/proj/fma.patch new file mode 100644 index 00000000000..d311c3b33a6 --- /dev/null +++ b/community/proj/fma.patch @@ -0,0 +1,37 @@ +From 7ab3ee73706c128fd82cc497c86229ba05e6df2c Mon Sep 17 00:00:00 2001 +From: Kai Pastor <dg0yt@darc.de> +Date: Tue, 7 Jul 2020 19:55:05 +0200 +Subject: [PATCH] CMake build: Check "target_clones" before use + +gcc's "target_clones" and "ifunc" function attributes rely on +extensions to the ELF standard. Using them on MinGW causes "error: +the call requires 'ifunc', which is not supported by this target". +Amends 5396b72. +--- + src/lib_proj.cmake | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake +index abc9cc4be1..59cb957222 100644 +--- a/src/lib_proj.cmake ++++ b/src/lib_proj.cmake +@@ -303,7 +303,18 @@ source_group("CMake Files" FILES CMakeLists.txt) + # Embed PROJ_LIB data files location + add_definitions(-DPROJ_LIB="${CMAKE_INSTALL_PREFIX}/${DATADIR}") + +-add_definitions(-DTARGET_CLONES_FMA_ALLOWED) ++# The gcc "target_clones" function attribute relies on an extension ++# to the ELF standard. It must not be used on MinGW. ++include(CheckCXXSourceCompiles) ++set(CMAKE_REQUIRED_QUIET TRUE) ++check_cxx_source_compiles([[ ++ __attribute__((target_clones("fma","default"))) ++ int clonable() { return 0; } ++ int main() { return clonable(); } ++]] TARGET_CLONES_FMA_ALLOWED) ++if(TARGET_CLONES_FMA_ALLOWED) ++ add_definitions(-DTARGET_CLONES_FMA_ALLOWED) ++endif() + + ################################################# + ## targets: libproj and proj_config.h |