[dev-libs/Ice] revert ruby on 3.6 prepare 3.7 for tree
This commit is contained in:
@@ -53,6 +53,10 @@ DEPEND="${RDEPEND}
|
||||
S="${WORKDIR}/${PN}"
|
||||
PHP_EXT_S="${S}/php"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.7.6-fix-musl-build.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# prevent ruby-ng.eclass from messing with pkg_setup
|
||||
return
|
||||
@@ -70,21 +74,6 @@ src_prepare() {
|
||||
-e 's|-Werror ||g' \
|
||||
config/Make.rules.Linux || die
|
||||
|
||||
# skip udp test due to multicast
|
||||
# skip IceGrid/admin bug #649850
|
||||
# skip IceSSL tests due to requirement of internet connection
|
||||
# skip IceStorm/single bug #636834
|
||||
# IceUtil/stacktrace and IceStorm/stress fail with USE=debug
|
||||
# Glacier2/staticFiltering requires network access
|
||||
sed -i \
|
||||
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress --rfilter=IceUtil\/stacktrace --rfilter=Glacier2\/staticFiltering|' \
|
||||
cpp/Makefile || die
|
||||
|
||||
# fails even on unicode locale
|
||||
sed -i \
|
||||
-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
|
||||
ruby/Makefile || die
|
||||
|
||||
# fix for x86 IceBox test
|
||||
sed -i \
|
||||
-e 's|"32"|""|' \
|
||||
@@ -107,6 +96,7 @@ src_configure() {
|
||||
"embedded_runpath_prefix=\"${EPREFIX}/usr\""
|
||||
"new_dtags=yes"
|
||||
"OPTIMIZE=$(usex !debug)"
|
||||
"V=1"
|
||||
)
|
||||
|
||||
if use python; then
|
||||
@@ -124,7 +114,7 @@ src_configure() {
|
||||
|
||||
# make it use ruby27 only
|
||||
sed -i \
|
||||
-e 's|RUBY = ruby|\027|' \
|
||||
-e 's|RUBY ?= ruby|\027|' \
|
||||
ruby/config/Make.rules || die
|
||||
sed -i \
|
||||
-e 's|env ruby|\027|' \
|
||||
|
||||
Reference in New Issue
Block a user