summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2016-11-06 15:51:01 +0100
committerHans de Graaff <graaff@gentoo.org>2016-11-06 16:24:42 +0100
commit7c8761facfff957141d170ffa05159c3218228fa (patch)
tree0f67bf1165220b67eedcd5a46da6e4206856a643 /net-wireless
parentdev-lua/luasec: version bump (bug #595628) (diff)
downloadgentoo-7c8761facfff957141d170ffa05159c3218228fa.tar.gz
gentoo-7c8761facfff957141d170ffa05159c3218228fa.tar.bz2
gentoo-7c8761facfff957141d170ffa05159c3218228fa.zip
net-wireless/lorcon: add ruby21, bug 589418
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/lorcon/lorcon-0.0_p20150109.ebuild7
-rw-r--r--net-wireless/lorcon/lorcon-9999.ebuild7
2 files changed, 8 insertions, 6 deletions
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index 1a9622c59bb3..b507490492c1 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -7,7 +7,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
-USE_RUBY="ruby20"
+USE_RUBY="ruby20 ruby21"
RUBY_OPTIONAL=yes
inherit distutils-r1 ruby-ng
@@ -91,8 +91,9 @@ each_ruby_compile() {
sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
"${RUBY}" -C ruby-lorcon extconf.rb || die
sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
- sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" ruby-lorcon/Makefile || die
- emake -C ruby-lorcon
+ sed -i -e "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" \
+ -e "s#-Wl,--no-undefined##" ruby-lorcon/Makefile || die
+ emake V=1 -C ruby-lorcon
}
each_ruby_install() {
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index f91f561b6a11..356a06757605 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
DISTUTILS_OPTIONAL=1
-USE_RUBY="ruby20"
+USE_RUBY="ruby20 ruby21"
RUBY_OPTIONAL=yes
inherit distutils-r1 ruby-ng
@@ -91,8 +91,9 @@ each_ruby_compile() {
sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon -L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
"${RUBY}" -C ruby-lorcon extconf.rb || die
sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
- sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" ruby-lorcon/Makefile || die
- emake -C ruby-lorcon
+ sed -i -e "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" \
+ -e "s#-Wl,--no-undefined##" ruby-lorcon/Makefile || die
+ emake V=1 -C ruby-lorcon
}
each_ruby_install() {