summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXorg2020-05-21 19:03:27 +0200
committerXorg2020-05-21 19:03:27 +0200
commit4ab6119e40e0638613a6bd120bbdbf3b2e8e2a9d (patch)
tree1e2ba9150871698ecb8d45494dac29c30f41f8aa
parent45d94ba0d2e02ea7c9c0cad20a7f656e0aee0165 (diff)
downloadaur-4ab6119e40e0638613a6bd120bbdbf3b2e8e2a9d.tar.gz
Build with CMake/Ninja
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD27
2 files changed, 12 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a4da7bc029f..d007b4e634b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libcpuid-git
pkgdesc = A small C library for x86 CPU detection and feature extraction
- pkgver = 0.4.1.r0.ga6123e8
+ pkgver = 0.4.1.r66.g1a00dac
pkgrel = 1
epoch = 2
url = http://libcpuid.sourceforge.net
@@ -8,6 +8,8 @@ pkgbase = libcpuid-git
arch = x86_64
license = BSD
makedepends = git
+ makedepends = cmake
+ makedepends = ninja
makedepends = doxygen
depends = glibc
provides = libcpuid
diff --git a/PKGBUILD b/PKGBUILD
index 0adadea1054c..ba86256b9f89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
_pkgname=libcpuid
pkgname=$_pkgname-git
epoch=2
-pkgver=0.4.1.r0.ga6123e8
+pkgver=0.4.1.r66.g1a00dac
pkgrel=1
pkgdesc="A small C library for x86 CPU detection and feature extraction"
arch=('i686' 'x86_64')
url="http://libcpuid.sourceforge.net"
license=('BSD')
depends=('glibc')
-makedepends=('git' 'doxygen')
+makedepends=('git' 'cmake' 'ninja' 'doxygen')
conflicts=('libcpuid')
provides=('libcpuid')
source=("git+https://github.com/anrieff/libcpuid.git")
@@ -23,24 +23,15 @@ pkgver() {
}
build() {
- cd "$srcdir/$_pkgname"
- msg2 "Run 'libtoolize'..."
- libtoolize
-
- msg2 "Run 'autoreconf --install'..."
- autoreconf --install
-
- msg2 "Run './configure'..."
- ./configure --prefix=/usr
+ msg2 "Generate build system..."
+ cmake -S "$srcdir/$_pkgname" -B build -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
- msg2 "Run 'make'..."
- make
+ msg2 "Build..."
+ cmake --build build
}
package() {
- cd "$srcdir/$_pkgname"
- make DESTDIR="$pkgdir" install
-
- msg2 "Install license..."
- install -Dvm644 "COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ msg2 "Install..."
+ DESTDIR="$pkgdir" cmake --install build
+ install -Dvm644 "$srcdir/$_pkgname/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}