diff options
| author | Michael Truog <mjtruog@gmail.com> | 2017-08-26 18:17:23 -0700 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-08-28 07:11:04 +0000 |
| commit | 097634bcd2209f60deb5c4ac7305d028965ae23a (patch) | |
| tree | 5fcc18a8515d429de2f4221a6b204d5fd48cccee /testing/cloudi | |
| parent | 2fd0a401a65981b773cdff8f311e9442e3095014 (diff) | |
| download | aports-097634bcd2209f60deb5c4ac7305d028965ae23a.tar.bz2 aports-097634bcd2209f60deb5c4ac7305d028965ae23a.tar.xz | |
testing/cloudi: upgrade to 1.7.2-rc2
* Fix parallel make use
* Add OCaml/Haskell dependencies based on package architecture
* Switch to using Python 3 instead of Python 2
Diffstat (limited to 'testing/cloudi')
| -rw-r--r-- | testing/cloudi/0010-Set-configured-log-path.patch | 11 | ||||
| -rw-r--r-- | testing/cloudi/APKBUILD | 48 |
2 files changed, 33 insertions, 26 deletions
diff --git a/testing/cloudi/0010-Set-configured-log-path.patch b/testing/cloudi/0010-Set-configured-log-path.patch deleted file mode 100644 index bd0843d463..0000000000 --- a/testing/cloudi/0010-Set-configured-log-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/cloudi_minimal.conf.in -+++ src/cloudi_minimal.conf.in -@@ -14,7 +14,7 @@ - [{prefix, "/cloudi/log/"}, - {module, cloudi_service_filesystem}, - {args, -- [{directory, "@prefix@/var/log/cloudi"}, -+ [{directory, "/var/log/cloudi"}, - {read, [{"/cloudi/log/cloudi.log", -16384}]}, - {refresh, 10}]}, - {dest_refresh, none}], diff --git a/testing/cloudi/APKBUILD b/testing/cloudi/APKBUILD index 0d2175fbc4..8a76776bbf 100644 --- a/testing/cloudi/APKBUILD +++ b/testing/cloudi/APKBUILD @@ -28,9 +28,9 @@ # (shown below with the assignment of CLOUDI_PID_FILE). pkgname=cloudi -pkgver=1.7.2_rc1 -_srcver=70addfda7133ac209157d48e38be70be7597ce8a -pkgrel=2 +pkgver=1.7.2_rc2 +_srcver=1.7.2-rc2 +pkgrel=0 pkgdesc="Cloud computing framework for efficient, scalable, and stable soft-realtime event processing." url="http://cloudi.org/" license="MIT" @@ -60,24 +60,43 @@ makedepends="autoconf erlang-tools erlang-xmerl gmp-dev + go libexecinfo-dev libtool nodejs openjdk8 perl php7 - python2 - python2-dev + python3 + python3-dev ruby " install="" subpackages="" -source="https://github.com/$pkgname/$pkgname/archive/$_srcver.tar.gz +source="https://github.com/$pkgname/$pkgname/archive/v$_srcver.tar.gz 0005-Disable-tests-for-aports-buildservers.patch - 0010-Set-configured-log-path.patch $pkgname.initd" builddir="$srcdir/CloudI-$_srcver/src" +# configure additional dependencies based on the package architecture +CONFIGURE_ARGS="" +# Enable Haskell on the appropriate architectures +case "$CTARGET_ARCH" in +x86_64 | armhf) + makedepends="$makedepends ghc cabal zlib-dev" + CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-haskell-support" + ;; +esac +# Enable OCaml on the appropriate architectures +case "$CTARGET_ARCH" in +x86 | armhf | s390x) + ;; +*) + makedepends="$makedepends ocaml" + CONFIGURE_ARGS="$CONFIGURE_ARGS --enable-ocaml-support" + ;; +esac + prepare() { cd "$builddir" default_prepare @@ -96,25 +115,24 @@ build() { --infodir=/usr/share/info \ --host="$CHOST" \ --build="$CBUILD" \ - --with-cxx-backtrace - # -j1 is currently required due to automake usage for java and erlang - # which will be fixed in the future - make -j1 + --with-cxx-backtrace \ + --with-python-version=3 \ + --enable-go-support $CONFIGURE_ARGS + make } check() { cd "$builddir" - make -j1 ct + make ct } package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install install -m755 -D "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname } -sha512sums="c47d3016002c5cf76782eb45a8c9da8aafa27d2046c82d6339dd59b88fb84e7c17f7df67071d9c3ca4fc8e87cd45980494664cd4ba5fb8900a67e47e909a0e7c 70addfda7133ac209157d48e38be70be7597ce8a.tar.gz +sha512sums="72ad7406c2917c973dd3224402a6a7d2614d671cbea62cfe72baf715cfc6879c3c83bc1e3e734dd32bf5e3d7f618fb593b4773113697476a2c604ea60a691ce4 v1.7.2-rc2.tar.gz cf380a2585e6116b3a0bc21b9846d91b96adcb754fa0805b571e99bbd9f696aa636d0bdeb6d85d05e34b65f8880afb01a02abb09e6797af1d4586664427add75 0005-Disable-tests-for-aports-buildservers.patch -cea17814085d40cc56ce21465bff1f8dd9f37f93e237e63b333d9f5d7093d6880b3204879eb8e2175e056d73928cff3d42efab897713d04f8cac87e7f07f970e 0010-Set-configured-log-path.patch 053f860f656617012208a0e1909e43b2f8979d381a90d3fa5a745a9cf5021fe54556a641fef2badaa9955f2394d00e32183389cb9b501169dcbf8cbe4fbb0329 cloudi.initd" |