Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/files/, dev-libs/librdkafka/
Date: Fri, 27 Jan 2017 13:34:50
Message-Id: 1485524081.aa140eb9148c3e9edf799b5006a7d08c71ad84f4.whissi@gentoo
1 commit: aa140eb9148c3e9edf799b5006a7d08c71ad84f4
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 27 13:33:06 2017 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 27 13:34:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa140eb9
7
8 dev-libs/librdkafka: Bump to v0.9.3
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-libs/librdkafka/Manifest | 1 +
13 .../librdkafka-0.9.3-remove-lz4-automagic.patch | 46 +++++++++++++
14 dev-libs/librdkafka/librdkafka-0.9.3.ebuild | 77 ++++++++++++++++++++++
15 3 files changed, 124 insertions(+)
16
17 diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
18 index 9a87fa0..b12358b 100644
19 --- a/dev-libs/librdkafka/Manifest
20 +++ b/dev-libs/librdkafka/Manifest
21 @@ -1,2 +1,3 @@
22 DIST librdkafka-0.9.1.tar.gz 478341 SHA256 5ad57e0c9a4ec8121e19f13f05bacc41556489dfe8f46ff509af567fdee98d82 SHA512 d2023cc6f976ad7440b25cffd1b59587f6497febd7ac1a6d76eb7799d294210f20170063fe25f2eb1eb3cc373df791526d1bc8d0ffbb0bef4519dae89b177147 WHIRLPOOL a54a6ee8f0db0ee13de80f86ef1f53d1667fb48e8e27016f2c497b448aa6a33b8073c022255e8e9f48b3497266872862d2ba717f7fed0a39a01f72936115b7b5
23 DIST librdkafka-0.9.2.tar.gz 620799 SHA256 c243b66956ebb196510ee0efda67825467e31b93639d5f24eb082b5d83f56824 SHA512 12a7da8de59de684da527ab969cd84dc8602741e9208941e1c7ad6dc69774bcbc3fbde0620d48c300372fa20b15aa826d309b71730119d82ec578e274c241152 WHIRLPOOL 7786443d9f365303ce0aad8278d83684999b23529e57fa08757fa38cce63f3944a3942475154bd613a0fb3e419c822a5651a00005eb77ed8f32f11689c11b924
24 +DIST librdkafka-0.9.3.tar.gz 637066 SHA256 745ead036f0d5b732e1cd035a1f31fc23665f2982bf9d799742034e0a1bd0be9 SHA512 5ec4c597eb7871c13feaaa96a76dc97c836f1fb5ae6c11d10675aee5577ad09d33e104af8fd497a8fbc7ee2c59434800d4cd857843f5c37460d4107ba0dc4e78 WHIRLPOOL fd6e57f34079fc0d808e35fee2d1ab736719b82f5c3f9b292e50bb522d8fea7e8b74adaf7ecfa1940e6eae2ca6f0c154593a99976261f4e11969f1596af450b1
25
26 diff --git a/dev-libs/librdkafka/files/librdkafka-0.9.3-remove-lz4-automagic.patch b/dev-libs/librdkafka/files/librdkafka-0.9.3-remove-lz4-automagic.patch
27 new file mode 100644
28 index 00000000..2efe27f
29 --- /dev/null
30 +++ b/dev-libs/librdkafka/files/librdkafka-0.9.3-remove-lz4-automagic.patch
31 @@ -0,0 +1,46 @@
32 +From 7c64454f83f74dbe0dd33e3726906b20740e19a1 Mon Sep 17 00:00:00 2001
33 +From: Thomas Deutschmann <whissi@××××××.de>
34 +Date: Fri, 27 Jan 2017 13:56:23 +0100
35 +Subject: [PATCH] configure: Add option to disable automagic dependency on
36 + liblz4
37 +
38 +Previously, mklove activated lz4 support when lz4 was found. This added
39 +a so called "automagic" dependency on liblz4 which is a problem from
40 +distributions.
41 +
42 +This commit will add an option which will allow you to explicit disable
43 +lz4 usage.
44 +---
45 + configure.librdkafka | 9 +++++++--
46 + 1 file changed, 7 insertions(+), 2 deletions(-)
47 +
48 +diff --git a/configure.librdkafka b/configure.librdkafka
49 +index cf47fea..71c29c7 100644
50 +--- a/configure.librdkafka
51 ++++ b/configure.librdkafka
52 +@@ -30,6 +30,8 @@ mkl_toggle_option "Development" ENABLE_REFCNT_DEBUG "--enable-refcnt-debug" "Ena
53 +
54 + mkl_toggle_option "Development" ENABLE_SHAREDPTR_DEBUG "--enable-sharedptr-debug" "Enable sharedptr debugging" "n"
55 +
56 ++mkl_toggle_option "Feature" ENABLE_LZ4 "--enable-lz4" "Enable LZ4 support" "y"
57 ++
58 + mkl_toggle_option "Feature" ENABLE_SSL "--enable-ssl" "Enable SSL support" "y"
59 + mkl_toggle_option "Feature" ENABLE_SASL "--enable-sasl" "Enable SASL support" "y"
60 +
61 +@@ -44,8 +46,11 @@ function checks {
62 + mkl_lib_check "zlib" "WITH_ZLIB" disable CC "-lz" \
63 + "#include <zlib.h>"
64 + mkl_lib_check "libcrypto" "" disable CC "-lcrypto"
65 +- mkl_lib_check "liblz4" "WITH_LZ4" disable CC "-llz4" \
66 +- "#include <lz4frame.h>"
67 ++
68 ++ if [[ "$ENABLE_LZ4" == "y" ]]; then
69 ++ mkl_lib_check "liblz4" "WITH_LZ4" disable CC "-llz4" \
70 ++ "#include <lz4frame.h>"
71 ++ fi
72 +
73 + # Snappy support is built-in
74 + mkl_allvar_set WITH_SNAPPY WITH_SNAPPY y
75 +--
76 +2.11.0
77 +
78
79 diff --git a/dev-libs/librdkafka/librdkafka-0.9.3.ebuild b/dev-libs/librdkafka/librdkafka-0.9.3.ebuild
80 new file mode 100644
81 index 00000000..79c16fc
82 --- /dev/null
83 +++ b/dev-libs/librdkafka/librdkafka-0.9.3.ebuild
84 @@ -0,0 +1,77 @@
85 +# Copyright 1999-2017 Gentoo Foundation
86 +# Distributed under the terms of the GNU General Public License v2
87 +# $Id$
88 +
89 +EAPI="6"
90 +
91 +inherit toolchain-funcs
92 +
93 +DESCRIPTION="Apache Kafka C/C++ client library"
94 +HOMEPAGE="https://github.com/edenhill/librdkafka"
95 +
96 +if [[ ${PV} == "9999" ]]; then
97 + EGIT_REPO_URI="
98 + git://github.com/edenhill/${PN}.git
99 + https://github.com/edenhill/${PN}.git
100 + "
101 +
102 + inherit git-r3
103 +else
104 + SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
105 + KEYWORDS="~amd64 ~arm ~hppa ~x86"
106 +fi
107 +
108 +LICENSE="BSD-2"
109 +
110 +# subslot = soname version
111 +SLOT="0/1"
112 +
113 +IUSE="lz4 sasl ssl static-libs"
114 +
115 +RDEPEND="
116 + lz4? ( app-arch/lz4:= )
117 + sasl? ( dev-libs/cyrus-sasl:= )
118 + ssl? ( dev-libs/openssl:0= )
119 + sys-libs/zlib
120 +"
121 +
122 +DEPEND="
123 + ${RDEPEND}
124 + virtual/pkgconfig
125 +"
126 +
127 +PATCHES=( "${FILESDIR}"/${PN}-0.9.3-remove-lz4-automagic.patch )
128 +
129 +src_configure() {
130 + tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
131 +
132 + local myeconf=(
133 + --no-cache
134 + --no-download
135 + --disable-debug-symbols
136 + $(use_enable lz4)
137 + $(use_enable sasl)
138 + $(usex static-libs '--enable-static' '')
139 + $(use_enable ssl)
140 + )
141 +
142 + econf ${myeconf[@]}
143 +}
144 +
145 +src_test() {
146 + emake -C tests run_local
147 +}
148 +
149 +src_install() {
150 + local DOCS=(
151 + README.md
152 + CONFIGURATION.md
153 + INTRODUCTION.md
154 + )
155 +
156 + default
157 +
158 + if ! use static-libs; then
159 + find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die
160 + fi
161 +}