aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-09-27 07:34:46 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-09-28 05:32:43 +0000
commit42f38af488fbb2c94e8f1b6db7a6e1c038e7841d (patch)
tree036b99daddff6dedb488480d2829787604fc1e19
parent8a1902e482ecdb314798b2b821a4d341f96cf971 (diff)
downloadaports-42f38af488fbb2c94e8f1b6db7a6e1c038e7841d.tar.gz
aports-42f38af488fbb2c94e8f1b6db7a6e1c038e7841d.tar.bz2
aports-42f38af488fbb2c94e8f1b6db7a6e1c038e7841d.tar.xz
testing/keystone: upgrade to 0.9.2
-rw-r--r--testing/keystone/APKBUILD47
-rw-r--r--testing/keystone/none-build-type.patch15
2 files changed, 18 insertions, 44 deletions
diff --git a/testing/keystone/APKBUILD b/testing/keystone/APKBUILD
index aefbe42157..5d2afbe9e6 100644
--- a/testing/keystone/APKBUILD
+++ b/testing/keystone/APKBUILD
@@ -1,52 +1,41 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=keystone
-pkgver=0.9.1
-pkgrel=4
+pkgver=0.9.2
+pkgrel=0
pkgdesc="Keystone assembler framework: Core (Arm, Arm64, Hexagon, Mips, PowerPC, Sparc, SystemZ & X86) + bindings"
url="http://www.keystone-engine.org"
arch="all"
license="custom"
-depends=""
-makedepends="cmake python3-dev"
-install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-python"
-source="$pkgname-$pkgver.tar.gz::https://github.com/keystone-engine/$pkgname/archive/$pkgver.tar.gz
- none-build-type.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+makedepends="cmake python3-dev py3-setuptools"
+subpackages="$pkgname-dev $pkgname-python"
+source="$pkgname-$pkgver.tar.gz::https://github.com/keystone-engine/keystone/archive/$pkgver.tar.gz"
build() {
- cd "$builddir"
mkdir -p build-shared && cd build-shared
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=None \
- -DBUILD_SHARED_LIBS=ON \
- -G "Unix Makefiles" ..
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=None \
+ -DBUILD_SHARED_LIBS=ON \
+ -G "Unix Makefiles" ..
cd ..
- make -C build-shared || return 1
+ make -C build-shared
+
+ cd "$builddir"/bindings/python
+ python3 setup.py build
}
package() {
- cd "$builddir"
make -C build-shared DESTDIR="$pkgdir" install
-}
-doc() {
- pkgdesc="Documentation and samples for $pkgname"
- arch="noarch"
- cd "$builddir"
- mkdir -p "${subpkgdir}/usr/share/doc/${pkgname}"
- mv samples "${subpkgdir}/usr/share/doc/${pkgname}"
+ cd "$builddir"/bindings/python
+ python3 setup.py install --prefix=/usr --root="$pkgdir"
}
python() {
pkgdesc="$pkgname python3 bindings"
depends="python3 keystone"
- arch="noarch"
- cd "$builddir"/bindings/python
- python3 setup.py build
- python3 setup.py install --prefix=/usr --root="$subpkgdir"
+ amove usr/lib/python3*
}
-sha512sums="3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17 keystone-0.9.1.tar.gz
-0a101a1398eec32e7cb2e5e201d8f822ec44916e7c40ed59caf89482102b536e1ec9a23bc9321bc14a4ac56db11669b4c7aa5b297942af25cf8ccf21d9483037 none-build-type.patch"
+sha512sums="5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b keystone-0.9.2.tar.gz"
diff --git a/testing/keystone/none-build-type.patch b/testing/keystone/none-build-type.patch
deleted file mode 100644
index d568628377..0000000000
--- a/testing/keystone/none-build-type.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-The build system includes its own check for available CMake build types.
-This check is incorrect as it doesn't include the None build type.
-
-diff -upr keystone-0.9.1.orig/llvm/CMakeLists.txt keystone-0.9.1/llvm/CMakeLists.txt
---- keystone-0.9.1.orig/llvm/CMakeLists.txt 2020-02-22 12:17:15.681580953 +0100
-+++ keystone-0.9.1/llvm/CMakeLists.txt 2020-02-22 12:18:20.949144210 +0100
-@@ -142,7 +142,7 @@ include(CPack)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-
- if (CMAKE_BUILD_TYPE AND
-- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
-+ NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(NONE|DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$")
- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
- endif()
-