Selaa lähdekoodia

Merge branch 'release-1.2.9-7'

Remove oniguruma from dependencies
Prevent building againt system oniguruma
Edvinas Valatka 9 vuotta sitten
vanhempi
commit
8a5d227a81
2 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 2 3
      .SRCINFO
  2. 4 3
      PKGBUILD

+ 2 - 3
.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

+ 4 - 3
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')