| 1 |
commit: 27e2f3689035cc8c4eb20364bd5f4f821a739a19 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 29 17:00:29 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 29 17:02:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e2f368 |
| 7 |
|
| 8 |
dev-libs/librdkafka: remove automagic on app-arch/zstd |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
...librdkafka-1.0.0-remove-automagic-on-zstd.patch | 29 ++++++++++++++++++++++ |
| 14 |
...fka-1.0.0.ebuild => librdkafka-1.0.0-r1.ebuild} | 6 ++++- |
| 15 |
2 files changed, 34 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..ed4dbda6b8a |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+commit ff67402dcfb2f4913a3ff1d84449a5e1620ee4ae |
| 24 |
+Author: Thomas Deutschmann <whissi@g.o> |
| 25 |
+AuthorDate: Mon Apr 29 18:57:10 2019 +0200 |
| 26 |
+Commit: Thomas Deutschmann <whissi@g.o> |
| 27 |
+CommitDate: Mon Apr 29 18:57:10 2019 +0200 |
| 28 |
+ |
| 29 |
+ configure: Add option to disable automagic dependency on zstd |
| 30 |
+ |
| 31 |
+ This commit will add an option which will allow you to explicit disable |
| 32 |
+ zstd usage. |
| 33 |
+ |
| 34 |
+diff --git a/mklove/modules/configure.zstd b/mklove/modules/configure.zstd |
| 35 |
+index 6dd621ad..3ea36ccf 100644 |
| 36 |
+--- a/mklove/modules/configure.zstd |
| 37 |
++++ b/mklove/modules/configure.zstd |
| 38 |
+@@ -9,8 +9,12 @@ |
| 39 |
+ # mkl_check zstd [<action>] |
| 40 |
+ # |
| 41 |
+ |
| 42 |
++mkl_toggle_option "Feature" ENABLE_ZSTD "--enable-zstd" "Enable support for ZSTD compression" "y" |
| 43 |
++ |
| 44 |
+ function manual_checks { |
| 45 |
+- local action=$1 |
| 46 |
++ local action=${1:-disable} |
| 47 |
++ |
| 48 |
++ [[ $ENABLE_ZSTD == y ]] || return 0 |
| 49 |
+ |
| 50 |
+ if [[ $WITH_STATIC_LINKING != y ]]; then |
| 51 |
+ # Homebrew does not provide a static library for zstd |
| 52 |
|
| 53 |
diff --git a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild |
| 54 |
similarity index 89% |
| 55 |
rename from dev-libs/librdkafka/librdkafka-1.0.0.ebuild |
| 56 |
rename to dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild |
| 57 |
index 1ba0f2d7c09..fa9a0fd5d55 100644 |
| 58 |
--- a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild |
| 59 |
+++ b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild |
| 60 |
@@ -22,12 +22,13 @@ LICENSE="BSD-2" |
| 61 |
# subslot = soname version |
| 62 |
SLOT="0/1" |
| 63 |
|
| 64 |
-IUSE="lz4 sasl ssl static-libs" |
| 65 |
+IUSE="lz4 sasl ssl static-libs zstd" |
| 66 |
|
| 67 |
RDEPEND=" |
| 68 |
lz4? ( app-arch/lz4:=[static-libs(-)?] ) |
| 69 |
sasl? ( dev-libs/cyrus-sasl:= ) |
| 70 |
ssl? ( dev-libs/openssl:0= ) |
| 71 |
+ zstd? ( app-arch/zstd:= ) |
| 72 |
sys-libs/zlib |
| 73 |
" |
| 74 |
|
| 75 |
@@ -36,6 +37,8 @@ DEPEND=" |
| 76 |
virtual/pkgconfig |
| 77 |
" |
| 78 |
|
| 79 |
+PATCHES=( "${FILESDIR}"/${P}-remove-automagic-on-zstd.patch ) |
| 80 |
+ |
| 81 |
src_configure() { |
| 82 |
tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP |
| 83 |
|
| 84 |
@@ -47,6 +50,7 @@ src_configure() { |
| 85 |
$(use_enable sasl) |
| 86 |
$(usex static-libs '--enable-static' '') |
| 87 |
$(use_enable ssl) |
| 88 |
+ $(use_enable zstd) |
| 89 |
) |
| 90 |
|
| 91 |
econf ${myeconf[@]} |
Archives