aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2017-04-04 09:10:21 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2017-04-04 09:10:32 +0000
commit3e97eb2f92a8f2518aef6d8c5e25c394be3cc785 (patch)
tree290955d14b9f88f7677249f3de4568a25a5b0a6e
parent313be3623d20ce034b4120777c1dd874f1f55dcf (diff)
downloadaports-3e97eb2f92a8f2518aef6d8c5e25c394be3cc785.tar.gz
aports-3e97eb2f92a8f2518aef6d8c5e25c394be3cc785.tar.bz2
aports-3e97eb2f92a8f2518aef6d8c5e25c394be3cc785.tar.xz
community/rapidjson: generate i586 code
-rw-r--r--community/rapidjson/APKBUILD9
-rw-r--r--community/rapidjson/disable-march-cxx-flag.patch20
2 files changed, 26 insertions, 3 deletions
diff --git a/community/rapidjson/APKBUILD b/community/rapidjson/APKBUILD
index bd9ae21099..6889ca84ab 100644
--- a/community/rapidjson/APKBUILD
+++ b/community/rapidjson/APKBUILD
@@ -3,7 +3,7 @@
# Note: This package contains only header files.
pkgname=rapidjson
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A fast JSON parser/generator for C++ with both SAX/DOM style API"
url="http://rapidjson.org/"
arch="noarch"
@@ -13,7 +13,9 @@ makedepends="$depends_dev"
checkdepends="gtest gtest-dev"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/miloyip/$pkgname/archive/v$pkgver.tar.gz
- do-not-include-gtest-src-dir.patch"
+ do-not-include-gtest-src-dir.patch
+ disable-march-cxx-flag.patch
+ "
builddir="$srcdir/$pkgname-$pkgver"
build() {
@@ -46,4 +48,5 @@ package() {
}
sha512sums="2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff rapidjson-1.1.0.tar.gz
-b6027268c3a10c602ab3df783790d3af537a9f23e74651bdd0a0dc6810144eeba37f15e12576f4b357e538c634e979b7c128e95294e60788f59d69ccb8367f6f do-not-include-gtest-src-dir.patch"
+b6027268c3a10c602ab3df783790d3af537a9f23e74651bdd0a0dc6810144eeba37f15e12576f4b357e538c634e979b7c128e95294e60788f59d69ccb8367f6f do-not-include-gtest-src-dir.patch
+7b5b0a33cec087358841a6c8ec38c68f510ccb0eef33894e8b6c5fa8d41c6bcdd46015f71a0888156f87bd809b52318aae17703faff63579248994d98f8a540f disable-march-cxx-flag.patch"
diff --git a/community/rapidjson/disable-march-cxx-flag.patch b/community/rapidjson/disable-march-cxx-flag.patch
new file mode 100644
index 0000000000..768c9fc96d
--- /dev/null
+++ b/community/rapidjson/disable-march-cxx-flag.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,7 +50,7 @@
+ endif(CCACHE_FOUND)
+
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
+ if (RAPIDJSON_BUILD_CXX11)
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+@@ -73,7 +73,7 @@
+ endif()
+ endif()
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-missing-field-initializers")
+ if (RAPIDJSON_BUILD_CXX11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()