summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Coffin2019-06-05 16:19:27 -0600
committerMatt Coffin2019-06-05 16:21:02 -0600
commit1790ca15ed9ed6b924c089d676d4ff23c2ae6b7c (patch)
treed588eefaaee2cc8e6290a302846b20c7b59673c0
parent7d3c49f1706578e308e66888ee020541d2cd7c98 (diff)
downloadaur-1790ca15ed9ed6b924c089d676d4ff23c2ae6b7c.tar.gz
version: 1.8.0
1.5.2 -> 1.8.0 I had to disable java bindings to get the build working. I'll push a new pkgrel once I have the time to figure out those failures. I think it's likely due to JDK versioning problems with Java 11.
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD52
-rw-r--r--hardcode-sources.patch10
3 files changed, 57 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 26863fca5ead..cfd141055380 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesos
pkgdesc = A cluster manager that simplifies the complexity of running applications on a shared pool of servers
- pkgver = 1.5.0
+ pkgver = 1.8.0
pkgrel = 1
url = http://mesos.apache.org/
arch = i686
@@ -10,6 +10,7 @@ pkgbase = mesos
makedepends = maven
makedepends = python2-setuptools
makedepends = openssl
+ makedepends = ninja
depends = python2
depends = zlib
depends = curl
@@ -19,11 +20,15 @@ pkgbase = mesos
depends = cyrus-sasl
depends = libnl>=3.2.28
depends = libevent>=2
+ depends = boost
+ depends = boost-libs
+ depends = leveldb
optdepends = openssl: ssl support
- source = ftp://apache.cs.utah.edu/apache.org/mesos/1.5.0/mesos-1.5.0.tar.gz
- source = https://apache.org/dist/mesos/1.5.0/mesos-1.5.0.tar.gz.asc
+ source = ftp://apache.cs.utah.edu/apache.org/mesos/1.8.0/mesos-1.8.0.tar.gz
+ source = https://apache.org/dist/mesos/1.8.0/mesos-1.8.0.tar.gz.asc
source = mesos-master.service
source = mesos-slave.service
+ source = hardcode-sources.patch
validpgpkeys = 4BF2061E73003185CA06E30FF99D6AD0F6FB762C
validpgpkeys = CE2C077CF6F6F7002DB0DB6AB5DA0D371B207A4D
validpgpkeys = 90A7F1E40A9BE920A82F4302CD56EF3924E79653
@@ -41,10 +46,12 @@ pkgbase = mesos
validpgpkeys = D64C61111ED9909C9071524FBDC218FB9AF7DC86
validpgpkeys = 070745B0AB67A2D3314D335623B0ADA4EF26082C
validpgpkeys = 30B6CAF9AB8560B2A3DAB2A6D10295D0D6EF55AD
- md5sums = SKIP
- md5sums = SKIP
- md5sums = 42e6bb21d7682b8a8f036c23532e4fe9
- md5sums = 55cc5e556bb0622f5f913a1999f17766
+ validpgpkeys = 526039B46E41368725C5B8790D5D2740E285E9AE
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = 42d7e11412ca9634297e55f33867c8897c58da7a10c113f6892311a5e362066d7e54377be2856c4fed641bcff75843cc243d5ac65e7eafbe79c8d25e5c033d14
+ sha512sums = a270d59551aaeb2bdbec7e5c6a2da02249299d208dba0ed3c9503b36b7928cc6a4920e795d865ce71c5a7fb4d492e37f434a210acd7beac9613f5bb155d79132
+ sha512sums = 92425bd2eb1c56812bdddf8ec540579b773043353ee9bf3f4c7e20bb4970c83c7b9ea1faecc38dc6d3f27e4125ceca9c35f7082e013c706ce6a28bc06d223cfe
pkgname = mesos
diff --git a/PKGBUILD b/PKGBUILD
index f015655c9ae0..7af7971b0bff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,31 @@
# Contributor: Matt Coffin <mcoffin13@gmail.com>
_python2_ver_major=$(pacman -Qi python2|gawk '$1~/Version/{split($3,v,".");print v[1] "." v[2]}')
pkgname=mesos
-pkgver=1.5.0
+pkgver=1.8.0
pkgrel=1
pkgdesc="A cluster manager that simplifies the complexity of running applications on a shared pool of servers"
arch=('i686' 'x86_64')
url=http://mesos.apache.org/
license=('Apache')
groups=('science')
-depends=('python2' 'zlib' 'curl' 'java-environment' 'apr' 'subversion' 'cyrus-sasl' 'libnl>=3.2.28' 'libevent>=2')
+depends=('python2' 'zlib' 'curl' 'java-environment' 'apr' 'subversion' 'cyrus-sasl' 'libnl>=3.2.28' 'libevent>=2' 'boost' 'boost-libs' 'leveldb')
optdepends=('openssl: ssl support')
-makedepends=('maven' 'python2-setuptools' 'openssl')
+makedepends=('maven' 'python2-setuptools' 'openssl' 'ninja')
#conflicts=('python2-shutilwhich')
source=("ftp://apache.cs.utah.edu/apache.org/$pkgname/$pkgver/$pkgname-${pkgver}.tar.gz"
"https://apache.org/dist/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz.asc"
"$pkgname-master.service"
- "$pkgname-slave.service")
+ "$pkgname-slave.service"
+ "hardcode-sources.patch")
# keys from: https://apache.org/dist/mesos/KEYS
-validpgpkeys=('4BF2061E73003185CA06E30FF99D6AD0F6FB762C' 'CE2C077CF6F6F7002DB0DB6AB5DA0D371B207A4D' '90A7F1E40A9BE920A82F4302CD56EF3924E79653' '3C0F564C3072733A83DC4511D1F466FDEDBC014B' '77F89AEEAD21B78B7C2DA9DB1A4EF22FD495B11E' '81BF3C55090CBE9684680A0348AF30DC5E47E0EA' 'D8FF2F25C752BA1354CB3F29CD910E8DFA23D685' '2A145F425F2299357E20004CC5BCD6DC398DF4F4' 'D6A0C1307D16A1F5DCD1E5C8CAFE789EAA31D1F2' 'FCD2F95760240B4D6ECAEA1BBAE9E5C50C4D1C63' 'E2454C1707E80C55B76B768C82F0CB466AACBD2B' '7FDF9F586C1BE20B192DB40DA479BB4EED50F391' '291ACACD6BD9A90C1ABFFE7517F6D528A2C2C74A' '7144142BE6DD206231B170DD174FB9FAC5FF85C1' 'D64C61111ED9909C9071524FBDC218FB9AF7DC86' '070745B0AB67A2D3314D335623B0ADA4EF26082C' '30B6CAF9AB8560B2A3DAB2A6D10295D0D6EF55AD')
+validpgpkeys=('4BF2061E73003185CA06E30FF99D6AD0F6FB762C' 'CE2C077CF6F6F7002DB0DB6AB5DA0D371B207A4D' '90A7F1E40A9BE920A82F4302CD56EF3924E79653' '3C0F564C3072733A83DC4511D1F466FDEDBC014B' '77F89AEEAD21B78B7C2DA9DB1A4EF22FD495B11E' '81BF3C55090CBE9684680A0348AF30DC5E47E0EA' 'D8FF2F25C752BA1354CB3F29CD910E8DFA23D685' '2A145F425F2299357E20004CC5BCD6DC398DF4F4' 'D6A0C1307D16A1F5DCD1E5C8CAFE789EAA31D1F2' 'FCD2F95760240B4D6ECAEA1BBAE9E5C50C4D1C63' 'E2454C1707E80C55B76B768C82F0CB466AACBD2B' '7FDF9F586C1BE20B192DB40DA479BB4EED50F391' '291ACACD6BD9A90C1ABFFE7517F6D528A2C2C74A' '7144142BE6DD206231B170DD174FB9FAC5FF85C1' 'D64C61111ED9909C9071524FBDC218FB9AF7DC86' '070745B0AB67A2D3314D335623B0ADA4EF26082C' '30B6CAF9AB8560B2A3DAB2A6D10295D0D6EF55AD' '526039B46E41368725C5B8790D5D2740E285E9AE')
+
+sha512sums=('SKIP'
+ 'SKIP'
+ '42d7e11412ca9634297e55f33867c8897c58da7a10c113f6892311a5e362066d7e54377be2856c4fed641bcff75843cc243d5ac65e7eafbe79c8d25e5c033d14'
+ 'a270d59551aaeb2bdbec7e5c6a2da02249299d208dba0ed3c9503b36b7928cc6a4920e795d865ce71c5a7fb4d492e37f434a210acd7beac9613f5bb155d79132'
+ '92425bd2eb1c56812bdddf8ec540579b773043353ee9bf3f4c7e20bb4970c83c7b9ea1faecc38dc6d3f27e4125ceca9c35f7082e013c706ce6a28bc06d223cfe')
-md5sums=('SKIP'
- 'SKIP'
- '42e6bb21d7682b8a8f036c23532e4fe9'
- '55cc5e556bb0622f5f913a1999f17766')
prepare() {
cd "$srcdir/$pkgname-$pkgver${_pkgver_minor}"
@@ -38,22 +41,33 @@ prepare() {
fi
# fix python path (/usr/bin/env python -> python2)
find src/cli -type f -print | xargs sed --in-place -e "1 s/\(\/usr\/bin\/env python$\)/\12/"
+ pushd src/java
+ patch < ../../../hardcode-sources.patch
+ popd
}
build() {
cd "$srcdir/$pkgname-$pkgver${_pkgver_minor}"/build
PYTHON=python${_python2_ver_major} \
../configure \
- --enable-optimize \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --exec-prefix=/usr \
- --sbindir=/usr/bin \
- --enable-ssl \
- --enable-libevent \
- --with-network-isolator
- make
+ --enable-optimize \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --exec-prefix=/usr \
+ --sbindir=/usr/bin \
+ --enable-ssl \
+ --enable-libevent \
+ --with-boost=/usr \
+ --with-leveldb=/usr \
+ --disable-java \
+ --with-network-isolator
+ make
+ # cmake .. -G Ninja \
+ # -DCMAKE_BUILD_TYPE=Release \
+ # -DENABLE_SSL=TRUE \
+ # -DENABLE_LIBEVENT=TRUE
+ # ninja
}
check() {
diff --git a/hardcode-sources.patch b/hardcode-sources.patch
new file mode 100644
index 000000000000..fc4c7b8b765c
--- /dev/null
+++ b/hardcode-sources.patch
@@ -0,0 +1,10 @@
+--- mesos.pom.in 2019-06-05 14:48:42.810165610 -0600
++++ mesos.pom.in.new 2019-06-05 14:48:30.336651638 -0600
+@@ -86,6 +86,7 @@
+ <configuration>
+ <sourcepath>@abs_top_srcdir@/src/java/src:@abs_top_builddir@/src/java/generated</sourcepath>
+ <subpackages>org.apache.mesos</subpackages>
++ <source>1.6</source>
+ </configuration>
+ <executions>
+ <execution>