aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2019-08-28 14:59:03 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-08-28 14:59:29 +0000
commit9cb69db0b5e752850cbd7d1daa0ee718b08df323 (patch)
tree5b56095b0ac218b06b588cd66701d1023875f837
parent5e588adf5159c1ddb146fc35e3b12771abf8ebd9 (diff)
Revert "community/openCPN: Enable aarch64 support Provide support for aarch64"
-rw-r--r--community/opencpn/APKBUILD8
-rw-r--r--community/opencpn/aarch64_support.patch15
2 files changed, 3 insertions, 20 deletions
diff --git a/community/opencpn/APKBUILD b/community/opencpn/APKBUILD
index 9a331139d68..cb56fa61fd8 100644
--- a/community/opencpn/APKBUILD
+++ b/community/opencpn/APKBUILD
@@ -6,7 +6,7 @@ pkgver=4.8.4
pkgrel=0
pkgdesc="OpenCPN is a cross platform electronic navigation system"
url="http://opencpn.org"
-arch="x86 x86_64 aarch64"
+arch="x86 x86_64"
license="GPL-2.0"
depends=""
makedepends="wxgtk-dev libexecinfo-dev linux-headers curl-dev cmake gpsd portaudio-dev tinyxml-dev"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="$pkgname-$pkgver.tar.gz::https://github.com/OpenCPN/OpenCPN/archive/v${pkgver}.tar.gz
CMakeList.txt.patch
CMakeList-wxWidgets.patch
- aarch64_support.patch
"
builddir="$srcdir/OpenCPN-${pkgver}"
@@ -27,7 +26,7 @@ build() {
-DBUNDLE_GSHHS=CRUDE \
-DBUNDLE_TCDATA=ON \
-DBUNDLE_DOCS=ON || return 1
- make -j8
+ make
}
package() {
@@ -37,5 +36,4 @@ package() {
sha512sums="d5b06446772cd23677bef56a994b98f1ab6709687cf414954d951718f68b04a27f1fd2010a7c6e2fbc57c29639282fe9bc25a6e2c1b46a23d67a7817ce61fc9f opencpn-4.8.4.tar.gz
a0cb0742f5d93e9e32529775d2d90ccaad6bec7e217e2fa08c6a3130c0cfbdb91ed4bf3a14db2a453f95a59d383fb7d698c33795f326597edf7d2e198d094b64 CMakeList.txt.patch
-34d17ee1e01eceb79702c642bdfb392178633525aca059c07bc424691aaafb5252d56c4c3b9d42d7273f6663f33b1a18ee653964274b790cf6bd2ab6e57a8635 CMakeList-wxWidgets.patch
-ba9444badf39aa89f9c619a617719c25153ae3a5965593a306f75c3bcea194a98f88afab935a6d3ac19bb1aa865804b6df1cb7c2af7f97b3be722ddd7805c300 aarch64_support.patch"
+34d17ee1e01eceb79702c642bdfb392178633525aca059c07bc424691aaafb5252d56c4c3b9d42d7273f6663f33b1a18ee653964274b790cf6bd2ab6e57a8635 CMakeList-wxWidgets.patch"
diff --git a/community/opencpn/aarch64_support.patch b/community/opencpn/aarch64_support.patch
deleted file mode 100644
index a6342850370..00000000000
--- a/community/opencpn/aarch64_support.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -169,9 +169,9 @@
- SET (ARCH "i386")
- ENDIF (NOT WIN32)
-
--#IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
--# SET (ARCH "armhf")
--#ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+IF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-+ SET (ARCH "aarch64")
-+ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*")
-
- MESSAGE (STATUS "*** Build Architecture is ${ARCH}")
- SET(PACKAGE_RELEASE "1" CACHE STRING "Package release number")