summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdvinas Valatka2016-04-28 14:42:30 +0300
committerEdvinas Valatka2016-04-28 14:42:30 +0300
commit8a5d227a81fbae30f6c8142c30ffc820c7f35968 (patch)
tree454e197221627a8e4ac5912294e199dc2f4ceb9a
parent98f9a80ed83feedcc11d49b98f338503edf6b613 (diff)
parentfb7b428452379705ce7ceaf904fdddd45d3c1696 (diff)
downloadaur-8a5d227a81fbae30f6c8142c30ffc820c7f35968.tar.gz
Merge branch 'release-1.2.9-7'
Remove oniguruma from dependencies Prevent building againt system oniguruma
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da97e90ae103..dd26ade2506e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Apr 25 02:57:33 UTC 2016
+# Thu Apr 28 11:41:00 UTC 2016
pkgbase = libevhtp-seafile
pkgdesc = A more flexible replacement for libevent's httpd API. [Built for seafile]
pkgver = 1.2.9
- pkgrel = 6
+ pkgrel = 7
url = https://github.com/ellzey/libevhtp
arch = i686
arch = x86_64
@@ -13,7 +13,6 @@ pkgbase = libevhtp-seafile
license = BSD
makedepends = cmake
depends = libevent>=2.0.0
- depends = oniguruma
provides = libevhtp
conflicts = libevhtp
source = libevhtp-1.2.9.zip::https://github.com/ellzey/libevhtp/archive/1.2.9.zip
diff --git a/PKGBUILD b/PKGBUILD
index a7a35d357e36..d302b6f72c0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
_pkgname=libevhtp
pkgname="${_pkgname}"-seafile
pkgver=1.2.9
-pkgrel=6
+pkgrel=7
pkgdesc="A more flexible replacement for libevent's httpd API. [Built for seafile]"
arch=('i686' 'x86_64' 'armv5te' 'armv6h' 'armv7h')
url="https://github.com/ellzey/libevhtp"
license=('BSD')
-depends=('libevent>=2.0.0' 'oniguruma')
+depends=('libevent>=2.0.0')
makedepends=('cmake')
provides=('libevhtp')
conflicts=('libevhtp')
@@ -17,12 +17,13 @@ source=("${_pkgname}-${pkgver}.zip::https://github.com/ellzey/libevhtp/archive/$
build () {
cd "${srcdir}/${_pkgname}-${pkgver}"
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DEVHTP_DISABLE_SSL=ON -DEVHTP_BUILD_SHARED=ON ./
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DHAS_SYS_ONIG:FILEPATH="" -DEVHTP_DISABLE_SSL=ON -DEVHTP_BUILD_SHARED=ON ./
make
}
package () {
cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
+ rm -fv ${pkgdir}/usr/include/onigposix.h
}
sha256sums=('fc8572823ae7ed77cd0db8fd0e25983ebc770b271d36905fb1379db371aab28a')