From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6766D139085 for ; Fri, 27 Jan 2017 13:34:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6879EE0D04; Fri, 27 Jan 2017 13:34:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A3B2E0D04 for ; Fri, 27 Jan 2017 13:34:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED60F34164A for ; Fri, 27 Jan 2017 13:34:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62633319E for ; Fri, 27 Jan 2017 13:34:46 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1485524081.aa140eb9148c3e9edf799b5006a7d08c71ad84f4.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/files/, dev-libs/librdkafka/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/librdkafka/Manifest dev-libs/librdkafka/files/librdkafka-0.9.3-remove-lz4-automagic.patch dev-libs/librdkafka/librdkafka-0.9.3.ebuild X-VCS-Directories: dev-libs/librdkafka/files/ dev-libs/librdkafka/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: aa140eb9148c3e9edf799b5006a7d08c71ad84f4 X-VCS-Branch: master Date: Fri, 27 Jan 2017 13:34:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5d0e3388-6c4c-4955-b0e2-e35bf6c311ee X-Archives-Hash: 715d6675366621c9649fd83f105be72e commit: aa140eb9148c3e9edf799b5006a7d08c71ad84f4 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jan 27 13:33:06 2017 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jan 27 13:34:41 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa140eb9 dev-libs/librdkafka: Bump to v0.9.3 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/librdkafka/Manifest | 1 + .../librdkafka-0.9.3-remove-lz4-automagic.patch | 46 +++++++++++++ dev-libs/librdkafka/librdkafka-0.9.3.ebuild | 77 ++++++++++++++++++++++ 3 files changed, 124 insertions(+) diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest index 9a87fa0..b12358b 100644 --- a/dev-libs/librdkafka/Manifest +++ b/dev-libs/librdkafka/Manifest @@ -1,2 +1,3 @@ DIST librdkafka-0.9.1.tar.gz 478341 SHA256 5ad57e0c9a4ec8121e19f13f05bacc41556489dfe8f46ff509af567fdee98d82 SHA512 d2023cc6f976ad7440b25cffd1b59587f6497febd7ac1a6d76eb7799d294210f20170063fe25f2eb1eb3cc373df791526d1bc8d0ffbb0bef4519dae89b177147 WHIRLPOOL a54a6ee8f0db0ee13de80f86ef1f53d1667fb48e8e27016f2c497b448aa6a33b8073c022255e8e9f48b3497266872862d2ba717f7fed0a39a01f72936115b7b5 DIST librdkafka-0.9.2.tar.gz 620799 SHA256 c243b66956ebb196510ee0efda67825467e31b93639d5f24eb082b5d83f56824 SHA512 12a7da8de59de684da527ab969cd84dc8602741e9208941e1c7ad6dc69774bcbc3fbde0620d48c300372fa20b15aa826d309b71730119d82ec578e274c241152 WHIRLPOOL 7786443d9f365303ce0aad8278d83684999b23529e57fa08757fa38cce63f3944a3942475154bd613a0fb3e419c822a5651a00005eb77ed8f32f11689c11b924 +DIST librdkafka-0.9.3.tar.gz 637066 SHA256 745ead036f0d5b732e1cd035a1f31fc23665f2982bf9d799742034e0a1bd0be9 SHA512 5ec4c597eb7871c13feaaa96a76dc97c836f1fb5ae6c11d10675aee5577ad09d33e104af8fd497a8fbc7ee2c59434800d4cd857843f5c37460d4107ba0dc4e78 WHIRLPOOL fd6e57f34079fc0d808e35fee2d1ab736719b82f5c3f9b292e50bb522d8fea7e8b74adaf7ecfa1940e6eae2ca6f0c154593a99976261f4e11969f1596af450b1 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 new file mode 100644 index 00000000..2efe27f --- /dev/null +++ b/dev-libs/librdkafka/files/librdkafka-0.9.3-remove-lz4-automagic.patch @@ -0,0 +1,46 @@ +From 7c64454f83f74dbe0dd33e3726906b20740e19a1 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Fri, 27 Jan 2017 13:56:23 +0100 +Subject: [PATCH] configure: Add option to disable automagic dependency on + liblz4 + +Previously, mklove activated lz4 support when lz4 was found. This added +a so called "automagic" dependency on liblz4 which is a problem from +distributions. + +This commit will add an option which will allow you to explicit disable +lz4 usage. +--- + configure.librdkafka | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/configure.librdkafka b/configure.librdkafka +index cf47fea..71c29c7 100644 +--- a/configure.librdkafka ++++ b/configure.librdkafka +@@ -30,6 +30,8 @@ mkl_toggle_option "Development" ENABLE_REFCNT_DEBUG "--enable-refcnt-debug" "Ena + + mkl_toggle_option "Development" ENABLE_SHAREDPTR_DEBUG "--enable-sharedptr-debug" "Enable sharedptr debugging" "n" + ++mkl_toggle_option "Feature" ENABLE_LZ4 "--enable-lz4" "Enable LZ4 support" "y" ++ + mkl_toggle_option "Feature" ENABLE_SSL "--enable-ssl" "Enable SSL support" "y" + mkl_toggle_option "Feature" ENABLE_SASL "--enable-sasl" "Enable SASL support" "y" + +@@ -44,8 +46,11 @@ function checks { + mkl_lib_check "zlib" "WITH_ZLIB" disable CC "-lz" \ + "#include " + mkl_lib_check "libcrypto" "" disable CC "-lcrypto" +- mkl_lib_check "liblz4" "WITH_LZ4" disable CC "-llz4" \ +- "#include " ++ ++ if [[ "$ENABLE_LZ4" == "y" ]]; then ++ mkl_lib_check "liblz4" "WITH_LZ4" disable CC "-llz4" \ ++ "#include " ++ fi + + # Snappy support is built-in + mkl_allvar_set WITH_SNAPPY WITH_SNAPPY y +-- +2.11.0 + diff --git a/dev-libs/librdkafka/librdkafka-0.9.3.ebuild b/dev-libs/librdkafka/librdkafka-0.9.3.ebuild new file mode 100644 index 00000000..79c16fc --- /dev/null +++ b/dev-libs/librdkafka/librdkafka-0.9.3.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit toolchain-funcs + +DESCRIPTION="Apache Kafka C/C++ client library" +HOMEPAGE="https://github.com/edenhill/librdkafka" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI=" + git://github.com/edenhill/${PN}.git + https://github.com/edenhill/${PN}.git + " + + inherit git-r3 +else + SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~hppa ~x86" +fi + +LICENSE="BSD-2" + +# subslot = soname version +SLOT="0/1" + +IUSE="lz4 sasl ssl static-libs" + +RDEPEND=" + lz4? ( app-arch/lz4:= ) + sasl? ( dev-libs/cyrus-sasl:= ) + ssl? ( dev-libs/openssl:0= ) + sys-libs/zlib +" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/${PN}-0.9.3-remove-lz4-automagic.patch ) + +src_configure() { + tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP + + local myeconf=( + --no-cache + --no-download + --disable-debug-symbols + $(use_enable lz4) + $(use_enable sasl) + $(usex static-libs '--enable-static' '') + $(use_enable ssl) + ) + + econf ${myeconf[@]} +} + +src_test() { + emake -C tests run_local +} + +src_install() { + local DOCS=( + README.md + CONFIGURATION.md + INTRODUCTION.md + ) + + default + + if ! use static-libs; then + find "${ED}"usr/lib* -name '*.la' -o -name '*.a' -delete || die + fi +}