[dev-libs/Ice] update again

This commit is contained in:
Robert Förster 2020-08-16 16:20:18 +02:00
parent bb577e6904
commit 6c2cbe28e1
1 changed files with 6 additions and 21 deletions

View File

@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
# Maintainer notes:
# TODO: java bindings
#S="${WORKDIR}/${P,}"
S="${WORKDIR}/${PN}"
PHP_EXT_S="${S}/php"
pkg_setup() {
@ -65,13 +65,9 @@ src_unpack() {
src_prepare() {
default
sed -i \
-e 's|-L\$\(libdir\)||' \
cpp/config/Make.rules || die
sed -i \
-e 's|-Werror ||g' \
cpp/config/Make.rules.Linux || die
config/Make.rules.Linux || die
# skip udp test due to multicast
# skip IceGrid/admin bug #649850
@ -91,7 +87,7 @@ src_prepare() {
# fix for x86 IceBox test
sed -i \
-e 's|"32"|""|' \
scripts/TestUtil.py || die
scripts/IceBoxUtil.py || die
}
src_configure() {
@ -105,13 +101,6 @@ src_configure() {
"OPTIMIZE=$(usex !debug)"
)
sed -i \
-e "s|g++|$(tc-getCXX)|" \
-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
cpp/config/Make.rules{,.Linux} python/config/Make.rules || die
if use python; then
local S="${S}/python"
python_copy_sources
@ -122,7 +111,7 @@ src_configure() {
SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
MAKE_RULES_RUBY=(
"install_rubydir=\"${ED}/${SITERUBY}\""
"install_libdir=\"${ED}/${SITERUBYARCH}\""
"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
)
# make it use ruby27 only
@ -135,9 +124,6 @@ src_configure() {
sed -i \
-e 's|env ruby|\027|' \
ruby/scripts/slice2rb || die
sed -i \
-e 's|output.write("ruby|\027|' \
scripts/TestUtil.py || die
fi
use test && python_setup
@ -161,7 +147,7 @@ src_compile() {
ln -s "${S}/slice" || die
ln -s "${S}/Makefile" || die
emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
popd >/dev/null || die
done
fi
@ -204,7 +190,6 @@ src_test() {
src_install() {
local DOCS=( CHANGELOG*.md README.md )
use doc && DOCS+=( "${DISTDIR}/${PN}-3.6.4.pdf" )
einstalldocs
insinto /usr/share/${P}
@ -240,7 +225,7 @@ src_install() {
for i in $(php_get_slots); do
php_init_slot_env "${i}"
insinto "${EXT_DIR}"
newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
newins "php/lib/ice.so" "${PHP_EXT_NAME}.so"
done
php-ext-source-r3_createinifiles