diff options
| author |   Ultrabug <ultrabug@gentoo.org> | 2017-08-17 09:03:00 +0200 |
|---|---|---|
| committer | Ultrabug <ultrabug@gentoo.org> | 2017-08-17 09:03:00 +0200 |
| commit | 3012f0760f59d22314d489db11e373071b43396b (patch) | |
| tree | f2ee75e9aaaaa69e5f81317c363da8028bfc963d /dev-db/scylla/scylla-9999.ebuild | |
| parent | scylla: realized that 1.7 does not have the gentoo patches yet... stick with ... (diff) | |
| download | ultrabug-3012f0760f59d22314d489db11e373071b43396b.tar.gz ultrabug-3012f0760f59d22314d489db11e373071b43396b.tar.bz2 ultrabug-3012f0760f59d22314d489db11e373071b43396b.zip | |
dev-db/scylla: version bump to prepare for the 2.0 release
Diffstat (limited to 'dev-db/scylla/scylla-9999.ebuild')
| -rw-r--r-- | dev-db/scylla/scylla-9999.ebuild | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild index 7c08387..c444c2f 100644 --- a/dev-db/scylla/scylla-9999.ebuild +++ b/dev-db/scylla/scylla-9999.ebuild @@ -6,8 +6,9 @@ EAPI=6 if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/scylladb/scylla.git" inherit git-r3 - KEYWORDS="~amd64" else + MY_PV="${PV/_rc/.rc}" + MY_P="${PN}-${MY_PV}" AMI_COMMIT="" C_ARES_COMMIT="" DPDK_COMMIT="" @@ -15,8 +16,8 @@ else SEASTAR_COMMIT="" SWAGGER_COMMIT="" SRC_URI=" - https://github.com/scylladb/${PN}/archive/scylla-${PV}.tar.gz -> ${P}.tar.gz - https://github.com/scylladb/scylla-seastar/archive/${SEASTAR_COMMIT}.tar.gz -> scylla-seastar-${SEASTAR_COMMIT}.tar.gz + https://github.com/scylladb/${PN}/archive/scylla-${MY_PV}.tar.gz -> ${MY_P}.tar.gz + https://github.com/scylladb/seastar/archive/${SEASTAR_COMMIT}.tar.gz -> seastar-${SEASTAR_COMMIT}.tar.gz https://github.com/scylladb/scylla-swagger-ui/archive/${SWAGGER_COMMIT}.tar.gz -> scylla-swagger-ui-${SWAGGER_COMMIT}.tar.gz https://github.com/scylladb/dpdk/archive/${DPDK_COMMIT}.tar.gz -> dpdk-${DPDK_COMMIT}.tar.gz https://github.com/scylladb/fmt/archive/${FMT_COMMIT}.tar.gz -> fmt-${FMT_COMMIT}.tar.gz @@ -24,7 +25,7 @@ else https://github.com/scylladb/scylla-ami/archive/${AMI_COMMIT}.tar.gz -> scylla-ami-${AMI_COMMIT}.tar.gz " KEYWORDS="~amd64" - S="${WORKDIR}/scylla-${P}" + S="${WORKDIR}/scylla-${MY_P}" fi PYTHON_COMPAT=( python3_{4,5,6} ) @@ -105,7 +106,7 @@ src_prepare() { echo "${PV}-${git_commit}" > version else rmdir seastar || die - mv "${WORKDIR}/scylla-seastar-${SEASTAR_COMMIT}" seastar || die + mv "${WORKDIR}/seastar-${SEASTAR_COMMIT}" seastar || die rmdir seastar/dpdk || die mv "${WORKDIR}/dpdk-${DPDK_COMMIT}" seastar/dpdk || die @@ -123,7 +124,7 @@ src_prepare() { mv "${WORKDIR}/scylla-ami-${AMI_COMMIT}" dist/ami/files/scylla-ami || die # set version - echo "${PV}-gentoo" > version + echo "${MY_PV}-gentoo" > version fi # fix slotted antlr3 path @@ -140,6 +141,10 @@ src_prepare() { # fix seastar -Werror crashing build # sed -e 's/ -Werror//g' -i seastar/configure.py || die + # fix dpdk for >=glibc-2.25 + # https://github.com/scylladb/dpdk/issues/3 + sed -e '42i #include <sys/sysmacros.h>' -i seastar/dpdk/lib/librte_eal/linuxapp/eal/eal_pci_uio.c || die + # run a clean autoreconf on c-ares pushd seastar/c-ares eautoreconf || die |