summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lambiris2021-04-14 02:19:48 -0400
committerTony Lambiris2021-04-14 02:19:48 -0400
commit1a2f3cd763f2b5dc80384d374bea5c96681a3798 (patch)
tree6406eeff304cc0f23232cceafa60154e655f2928
parent71c4ebb883fa9313b14c751411d480a257fef499 (diff)
downloadaur-1a2f3cd763f2b5dc80384d374bea5c96681a3798.tar.gz
Fix build
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD28
-rw-r--r--fix-include-stdexcept.patch12
4 files changed, 36 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6b6b4af23eb3..33bfae15654a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rexgen-git
pkgdesc = A tool to create words based on regular expressions
pkgver = 2.1.3.r2.g585e86d
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/teeshop/rexgen
arch = i686
arch = x86_64
@@ -10,9 +10,12 @@ pkgbase = rexgen-git
makedepends = cmake
makedepends = flex
makedepends = bison
+ makedepends = clang
depends = git
- source = rexgen-git::git+https://github.com/teeshop/rexgen.git
+ source = rexgen-git::git+https://github.com/teeshop/rexgen
+ source = fix-include-stdexcept.patch
sha256sums = SKIP
+ sha256sums = 097d0adb6b380794ec73c279839250f37d24e153ab990f0a2ab399deca9f9412
pkgname = rexgen-git
diff --git a/.gitignore b/.gitignore
index 4d27e7eebb6c..792ee202a8dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
src
pkg
rexgen-git
-*pkg.tar.xz
+*.pkg.tar.*
tags
diff --git a/PKGBUILD b/PKGBUILD
index 943dc0fecb54..2773baf44ffe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,16 @@
pkgname=rexgen-git
pkgver=2.1.3.r2.g585e86d
-pkgrel=1
+pkgrel=2
pkgdesc="A tool to create words based on regular expressions"
arch=('i686' 'x86_64')
url="https://github.com/teeshop/rexgen"
license=('GPL')
depends=('git')
-makedepends=('gcc' 'cmake' 'flex' 'bison')
-source=("${pkgname}::git+https://github.com/teeshop/rexgen.git")
-sha256sums=('SKIP')
+makedepends=('gcc' 'cmake' 'flex' 'bison' 'clang')
+source=("${pkgname}::git+${url}" "fix-include-stdexcept.patch")
+sha256sums=('SKIP'
+ '097d0adb6b380794ec73c279839250f37d24e153ab990f0a2ab399deca9f9412')
pkgver() {
cd "${pkgname}"
@@ -18,22 +19,29 @@ pkgver() {
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
+prepare() {
+ cd "${srcdir}/${pkgname}"
+
+ patch -Np1 -i "${srcdir}/fix-include-stdexcept.patch"
+}
+
build() {
- mkdir -p "${pkgname}/src/build"
- cd "${pkgname}/src/build"
+ cd "${srcdir}/${pkgname}"
- #cmake -Wno-dev .. \
- # -DCMAKE_INSTALL_PREFIX=/usr \
- # -DOPENSSL_INCLUDE_DIR="/usr/include/openssl-1.0"
+ mkdir -p build
+ cd build
+ export CC=clang CXX=clang++
cmake -Wno-dev .. \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make ${MAKEFLAGS} all
}
package() {
- cd "${pkgname}/src/build"
+ cd "${srcdir}/${pkgname}"
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/fix-include-stdexcept.patch b/fix-include-stdexcept.patch
new file mode 100644
index 000000000000..e27d90535c9c
--- /dev/null
+++ b/fix-include-stdexcept.patch
@@ -0,0 +1,12 @@
+diff --git a/src/librexgen/iterator/iterator.h b/src/librexgen/iterator/iterator.h
+index 5b99c77..eabf264 100644
+--- a/src/librexgen/iterator/iterator.h
++++ b/src/librexgen/iterator/iterator.h
+@@ -26,6 +26,7 @@
+ #include <librexgen/osdepend.h>
+ #include <librexgen/state/serializablestate.h>
+ #include <librexgen/state/invaliditeratoridexception.h>
++#include <stdexcept>
+ #include <memory>
+
+ #ifdef __cplusplus