diff options
| author |   Sam James <sam@gentoo.org> | 2021-06-18 23:03:06 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2021-06-18 23:03:06 +0200 |
| commit | d1eed8871cfca707dcdf167d3e809b2e93854f55 (patch) | |
| tree | 23fe27aed594c6dd5fd407df90f3779ece699359 /dev-ruby/hiredis | |
| parent | dev-lang/tk: clean up patch (diff) | |
| download | gentoo-d1eed8871cfca707dcdf167d3e809b2e93854f55.tar.gz gentoo-d1eed8871cfca707dcdf167d3e809b2e93854f55.tar.bz2 gentoo-d1eed8871cfca707dcdf167d3e809b2e93854f55.zip | |
dev-ruby/hiredis: respect ${PKG_CONFIG}
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-ruby/hiredis')
| -rw-r--r-- | dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch | 6 | ||||
| -rw-r--r-- | dev-ruby/hiredis/hiredis-0.6.3.ebuild | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch index e8fb1f9ffa62..885d6d15819e 100644 --- a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch +++ b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch @@ -1,5 +1,5 @@ ---- a/ext/hiredis_ext/extconf.rb 2015-12-29 15:53:00.000000000 +0100 -+++ b/ext/hiredis_ext/extconf.rb 2018-04-21 07:40:15.973747727 +0200 +--- a/ext/hiredis_ext/extconf.rb ++++ b/ext/hiredis_ext/extconf.rb @@ -27,15 +27,8 @@ end @@ -13,7 +13,7 @@ - # Statically link to hiredis (mkmf can't do this for us) - $CFLAGS << " -I#{hiredis_dir}" - $LDFLAGS << " #{hiredis_dir}/libhiredis.a" -+ $CFLAGS << ' ' << `pkg-config hiredis --cflags-only-I`.chomp ++ $CFLAGS << ' ' << `${PKG_CONFIG} hiredis --cflags-only-I`.chomp + $LDFLAGS << ' -lhiredis' have_func("rb_thread_fd_select") diff --git a/dev-ruby/hiredis/hiredis-0.6.3.ebuild b/dev-ruby/hiredis/hiredis-0.6.3.ebuild index 79371e1ba364..7f495d631948 100644 --- a/dev-ruby/hiredis/hiredis-0.6.3.ebuild +++ b/dev-ruby/hiredis/hiredis-0.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,6 +23,7 @@ IUSE="" RDEPEND+=" >=dev-libs/hiredis-0.14:=" DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )" +DEPEND+=" virtual/pkgconfig" RUBY_S="${MY_P}" @@ -33,6 +34,7 @@ all_ruby_prepare() { } each_ruby_configure() { + tc-export PKG_CONFIG CC=$(tc-getCC) ${RUBY} -Cext/hiredis_ext extconf.rb || die } |