From 8bb033d089b07c323a244489a1579291a43b07b3 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 31 Mar 2023 13:40:52 +0100 Subject: Backport entire Ice ebuild from official Gentoo tree, add back shared/c++11 support --- dev-libs/Ice/Ice-3.7.8.ebuild | 272 ---------------------- dev-libs/Ice/Ice-3.7.9-r1.ebuild | 260 +++++++++++++++++++++ dev-libs/Ice/Ice-3.7.9.ebuild | 272 ---------------------- dev-libs/Ice/Manifest | 7 +- dev-libs/Ice/files/Ice-3.7.9-fix-musl-build.patch | 13 ++ dev-libs/Ice/files/Ice-3.7.9-py3k11.patch | 45 ++++ 6 files changed, 322 insertions(+), 547 deletions(-) delete mode 100644 dev-libs/Ice/Ice-3.7.8.ebuild create mode 100644 dev-libs/Ice/Ice-3.7.9-r1.ebuild delete mode 100644 dev-libs/Ice/Ice-3.7.9.ebuild create mode 100644 dev-libs/Ice/files/Ice-3.7.9-fix-musl-build.patch create mode 100644 dev-libs/Ice/files/Ice-3.7.9-py3k11.patch (limited to 'dev-libs/Ice') diff --git a/dev-libs/Ice/Ice-3.7.8.ebuild b/dev-libs/Ice/Ice-3.7.8.ebuild deleted file mode 100644 index cf22d32..0000000 --- a/dev-libs/Ice/Ice-3.7.8.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="7" - -PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7,3_8,3_9} pypy ) - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby22" - -PHP_EXT_NAME="IcePHP" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -PHP_EXT_OPTIONAL_USE=php - -USE_PHP="php7-0" - -inherit db-use eutils mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs - -DESCRIPTION="ICE middleware C++ library and generator tools" -HOMEPAGE="http://www.zeroc.com/" -SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV/_/-}.tar.gz -> ${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0/37" -KEYWORDS="amd64 x86" -IUSE="doc examples +ncurses mono php python ruby c++0x test debug" - -RDEPEND=">=dev-libs/expat-2.0.1 - >=app-arch/bzip2-1.0.5 - dev-libs/openssl:0= - dev-libs/libedit - >=dev-cpp/libmcpp-2.7.2-r3 - =dev-db/lmdb-0.9* - python? ( ${PYTHON_DEPS} ) - ruby? ( $(ruby_implementation_depend ruby22) ) - mono? ( dev-lang/mono ) - php? ( dev-lang/php:7.0 ) - !dev-python/IcePy - !dev-ruby/IceRuby" -DEPEND="${RDEPEND} - ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= ) - test? ( - ${PYTHON_DEPS} - dev-python/passlib[${PYTHON_USEDEP}] - )" - -# Maintainer notes: -# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3}) - -S="${P/_/-}" -S="${WORKDIR}/${S/I/i}" -PHP_EXT_S="${S}/php" - -pkg_setup() { - # prevent ruby-ng.eclass from messing with pkg_setup - return -} - -src_unpack() { - # prevent ruby-ng.eclass from messing with src_unpack - default -} - -src_prepare() { - # prevent ruby-ng.eclass from messing with src_prepare - default -} - -src_configure() { - CONFIGS=("shared") - use c++0x && CONFIGS+=("cpp11-shared") - MAKE_RULES=( - "prefix=\"${ED%/}/usr\"" - "install_docdir=\"${ED%/}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED%/}/usr/share/${P}/config\"" - "install_mandir=\"${ED%/}/usr/share/man\"" - "embedded_runpath_prefix=\"${EPREFIX}/usr\"" - "configs=${CONFIGS[*]}" - "new_dtags=yes" - "NOTEST=$(usex !test)" - "USE_READLINE=$(usex ncurses)" - "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 python/config/Make.rules || die "sed failed" - - if use python; then - local S="${S}/python" - python_copy_sources - fi - - if use ruby; then - SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" - MAKE_RULES_RUBY=( - "install_rubydir=\"${ED%/}/${SITERUBY}\"" - "install_libdir=\"${ED%/}/${SITERUBY}\"" - ) - - # make it use ruby22 only - sed -i \ - -e 's|RUBY = ruby|\022|' \ - ruby/config/Make.rules || die "sed failed" - sed -i \ - -e 's|env ruby|\022|' \ - ruby/config/s2rb.rb || die "sed failed" - sed -i \ - -e 's|env ruby|\022|' \ - ruby/scripts/slice2rb || die "sed failed" - sed -i \ - -e 's|output.write("ruby|\022|' \ - scripts/TestUtil.py || die "sed failed" - fi - - MAKE_RULES_MONO=( - "GACINSTALL=yes" - "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\"" - "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\"" - "install_libdir=\"${ED%/}/usr/$(get_libdir)\"" - "install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\"" - ) - - if has_version ">dev-lang/mono-4"; then - MAKE_RULES_MONO+=("MCS=mcs") - fi - - use test && python_setup -} - -src_compile() { - # Do not remove this export or build will break! - tc-export CXX - - emake -C cpp "${MAKE_RULES[@]}" srcs - - if use php; then - local i - for i in $(php_get_slots); do - mkdir -p "${WORKDIR}/${i}" || die - cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory" - - pushd "${WORKDIR}/${i}" >/dev/null || die - ln -s "${S}/cpp" || die - ln -s "${S}/config" || die - 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\"" - popd >/dev/null || die - done - fi - - if use python; then - building() { - emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}" - } - local S="${S}/python" - python_foreach_impl building - fi - - if use ruby; then - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" - fi - - if use mono; then - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" - fi -} - -src_test() { - local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - emake -C cpp "${MAKE_RULES[@]}" tests - - # php tests require the extension loaded and are therefore skipped - - if use python; then - testing() { - emake -C "${BUILD_DIR}" \ - "${MAKE_RULES[@]}" \ - PYTHON="${EPYTHON}" \ - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ - install_libdir="\"${D%/}/$(python_get_sitedir)\"" test - } - local S="${S}/python" - python_foreach_impl testing - fi - - if use ruby; then - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test - fi - - if use mono; then - # skip mono tests, bug #498484 - ewarn "Tests for C# are currently disabled." - #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test - fi -} - -src_install() { - local DOCS=( CHANGELOG*.md README.md ) - einstalldocs - - insinto /usr/share/${P} - doins -r slice - - emake -C cpp "${MAKE_RULES[@]}" install - find ${D}/usr/include ${D}/usr/share -type f -print0 | xargs -r0 chmod a-x - - if use examples; then - docinto examples-cpp - dodoc cpp/config/*.cfg - docompress -x /usr/share/doc/${PF}/examples-cpp - fi - - if use php; then - insinto "/usr/share/php/${PN}" - - local i - while IFS="" read -d $'\0' -r i; do - doins "${i}" - done < <(find "${S}/php/lib/" -name '*.php' -print0) - - pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die - - local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - for i in *; do - mkdir -p "${ED%/}/usr/share/php/${i}" || die - "${ED%/}"/usr/bin/slice2php \ - -I"${ED%/}/usr/share/${P}/slice/" --all \ - --output-dir "${ED%/}/usr/share/php/${i}" \ - --ice "${ED%/}/usr/share/${P}/slice/${i}"/* - done - - 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" - done - php-ext-source-r2_createinifiles - - popd >/dev/null || die - fi - - if use python; then - installation() { - mkdir -p "${D%/}/$(python_get_sitedir)" || die - - emake -C "${BUILD_DIR}" \ - "${MAKE_RULES[@]}" \ - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ - install_libdir="\"${D%/}/$(python_get_sitedir)\"" \ - install - } - local S="${S}/python" - python_foreach_impl installation - fi - - if use ruby; then - dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install - fi - - if use mono; then - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install - fi -} diff --git a/dev-libs/Ice/Ice-3.7.9-r1.ebuild b/dev-libs/Ice/Ice-3.7.9-r1.ebuild new file mode 100644 index 0000000..641716e --- /dev/null +++ b/dev-libs/Ice/Ice-3.7.9-r1.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +RUBY_OPTIONAL="yes" +USE_RUBY="ruby31" + +PHP_EXT_NAME="IcePHP" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +PHP_EXT_OPTIONAL_USE=php + +USE_PHP="php8-0 php8-1 php8-2" + +inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs + +DESCRIPTION="ICE middleware C++ library and generator tools" +HOMEPAGE="https://zeroc.com/products/ice" +SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz + doc? ( https://download.zeroc.com/Ice/$(ver_cut 1-2)/${PN}-3.7.1.pdf )" +LICENSE="GPL-2" +SLOT="0/37" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="c++0x debug doc examples php python ruby test" +RESTRICT="test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=">=app-arch/bzip2-1.0.5 + >=dev-libs/expat-2.0.1 + dev-libs/libedit + dev-cpp/libmcpp + dev-db/lmdb:= + dev-libs/openssl:0= + virtual/libcrypt:= + python? ( ${PYTHON_DEPS} ) + ruby? ( $(ruby_implementation_depend ruby31) )" +DEPEND="${RDEPEND} + test? ( + ${PYTHON_DEPS} + dev-python/passlib[${PYTHON_USEDEP}] + )" + +# Maintainer notes: +# TODO: java bindings + +S="${WORKDIR}/${P,}" +PHP_EXT_S="${S}/php" + +PATCHES=( + "${FILESDIR}/${P}-fix-musl-build.patch" + "${FILESDIR}/${P}-py3k11.patch" +) + +pkg_setup() { + # prevent ruby-ng.eclass from messing with pkg_setup + return +} + +src_unpack() { + # prevent ruby-ng.eclass from messing with src_unpack + default +} + +src_prepare() { + default + + sed -i \ + -e 's|-Werror ||g' \ + config/Make.rules.Linux || die + + # fix for x86 IceBox test + sed -i \ + -e 's|"32"|""|' \ + scripts/IceBoxUtil.py || die + + if use !test; then + # Disable building tests + sed -i \ + -e 's|include \$(top_srcdir)/config/Make.tests.rules||' \ + config/Make.rules || die + fi +} + +src_configure() { + MAKE_RULES=( + "embedded_runpath_prefix=\"${EPREFIX}/usr\"" + "OPTIMIZE=$(usex !debug)" + "V=1" + ) + MAKE_RULES+=("shared") + use c++0x && MAKE_RULES+=("cpp11-shared") + + if use python; then + local S="${S}/python" + python_copy_sources + fi + + if use ruby; then + SITERUBY="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" + SITERUBYARCH="$(ruby31 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" + MAKE_RULES_RUBY=( + "install_rubydir=\"${EPREFIX}/${SITERUBY}\"" + "install_rubylibdir=\"${EPREFIX}/${SITERUBYARCH}\"" + ) + + # make it use ruby31 only + sed -i \ + -e 's|RUBY ?= ruby|\031|' \ + ruby/config/Make.rules || die + sed -i \ + -e 's|env ruby|\031|' \ + ruby/config/s2rb.rb || die + sed -i \ + -e 's|env ruby|\031|' \ + ruby/scripts/slice2rb || die + fi + + use test && python_setup +} + +src_compile() { + # Do not remove this export or build will break! + tc-export CXX + + emake -C cpp "${MAKE_RULES[@]}" + + if use php; then + local i + for i in $(php_get_slots); do + mkdir -p "${WORKDIR}/${i}" || die + cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory" + + pushd "${WORKDIR}/${i}" >/dev/null || die + ln -s "${S}/cpp" || die + ln -s "${S}/config" || die + ln -s "${S}/slice" || die + ln -s "${S}/Makefile" || die + + emake -C php "${MAKE_RULES[@]}" "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\"" + popd >/dev/null || die + done + fi + + if use python; then + building() { + emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}" + } + local S="${S}/python" + python_foreach_impl building + fi + + if use ruby; then + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" + fi +} + +src_test() { + local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + emake -C cpp "${MAKE_RULES[@]}" test + + # php tests require the extension loaded and are therefore skipped + + if use python; then + testing() { + PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \ + "${MAKE_RULES[@]}" \ + PYTHON="${EPYTHON}" \ + install_pythondir="\"$(python_get_sitedir)\"" \ + install_libdir="\"$(python_get_sitedir)\"" test + } + local S="${S}/python" + python_foreach_impl testing + fi + + if use ruby; then + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test + fi +} + +src_install() { + local DOCS=( CHANGELOG*.md README.md ) + use doc && DOCS+=( "${DISTDIR}/${PN}-3.7.1.pdf" ) + einstalldocs + + MAKE_RULES_INSTALL=( + "prefix=\"${ED}/usr\"" + "install_docdir=\"${ED}/usr/share/doc/${PF}\"" + "install_configdir=\"${ED}/usr/share/${P}/config\"" + "install_mandir=\"${ED}/usr/share/man/man1\"" + ) + + insinto /usr/share/${P} + doins -r slice + + emake -C cpp "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" install + + if use examples; then + docinto examples-cpp + dodoc cpp/config/*.cfg + docompress -x /usr/share/doc/${PF}/examples-cpp + fi + + if use php; then + insinto "/usr/share/php/${PN}" + + local i + while IFS="" read -d $'\0' -r i; do + doins "${i}" + done < <(find "${S}/php/lib/" -name '*.php' -print0) + + pushd "${ED}/usr/share/${P}/slice" >/dev/null || die + + local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + for i in *; do + mkdir -p "${ED}/usr/share/php/${i}" || die + "${ED}"/usr/bin/slice2php \ + -I"${ED}/usr/share/${P}/slice/" --all \ + --output-dir "${ED}/usr/share/php/${i}" \ + --ice "${ED}/usr/share/${P}/slice/${i}"/* + done + + for i in $(php_get_slots); do + php_init_slot_env "${i}" + insinto "${EXT_DIR}" + newins "php/lib/ice.so" "${PHP_EXT_NAME}.so" + done + php-ext-source-r3_createinifiles + + popd >/dev/null || die + fi + + if use python; then + installation() { + mkdir -p "${D}/$(python_get_sitedir)" || die + + emake -C "${BUILD_DIR}" \ + "${MAKE_RULES[@]}" \ + "${MAKE_RULES_INSTALL[@]}" \ + install_pythondir="\"${D}/$(python_get_sitedir)\"" \ + install_libdir="\"${D}/$(python_get_sitedir)\"" \ + install + python_optimize + } + local S="${S}/python" + python_foreach_impl installation + fi + + if use ruby; then + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED}/${SITERUBY}\"" + "install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" + ) + dodir "${SITERUBY}" + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_INSTALL[@]}" "${MAKE_RULES_RUBY[@]}" install + fi +} diff --git a/dev-libs/Ice/Ice-3.7.9.ebuild b/dev-libs/Ice/Ice-3.7.9.ebuild deleted file mode 100644 index cf22d32..0000000 --- a/dev-libs/Ice/Ice-3.7.9.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="7" - -PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7,3_8,3_9} pypy ) - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby22" - -PHP_EXT_NAME="IcePHP" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -PHP_EXT_OPTIONAL_USE=php - -USE_PHP="php7-0" - -inherit db-use eutils mono-env php-ext-source-r3 python-r1 ruby-ng toolchain-funcs - -DESCRIPTION="ICE middleware C++ library and generator tools" -HOMEPAGE="http://www.zeroc.com/" -SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV/_/-}.tar.gz -> ${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0/37" -KEYWORDS="amd64 x86" -IUSE="doc examples +ncurses mono php python ruby c++0x test debug" - -RDEPEND=">=dev-libs/expat-2.0.1 - >=app-arch/bzip2-1.0.5 - dev-libs/openssl:0= - dev-libs/libedit - >=dev-cpp/libmcpp-2.7.2-r3 - =dev-db/lmdb-0.9* - python? ( ${PYTHON_DEPS} ) - ruby? ( $(ruby_implementation_depend ruby22) ) - mono? ( dev-lang/mono ) - php? ( dev-lang/php:7.0 ) - !dev-python/IcePy - !dev-ruby/IceRuby" -DEPEND="${RDEPEND} - ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= ) - test? ( - ${PYTHON_DEPS} - dev-python/passlib[${PYTHON_USEDEP}] - )" - -# Maintainer notes: -# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3}) - -S="${P/_/-}" -S="${WORKDIR}/${S/I/i}" -PHP_EXT_S="${S}/php" - -pkg_setup() { - # prevent ruby-ng.eclass from messing with pkg_setup - return -} - -src_unpack() { - # prevent ruby-ng.eclass from messing with src_unpack - default -} - -src_prepare() { - # prevent ruby-ng.eclass from messing with src_prepare - default -} - -src_configure() { - CONFIGS=("shared") - use c++0x && CONFIGS+=("cpp11-shared") - MAKE_RULES=( - "prefix=\"${ED%/}/usr\"" - "install_docdir=\"${ED%/}/usr/share/doc/${PF}\"" - "install_configdir=\"${ED%/}/usr/share/${P}/config\"" - "install_mandir=\"${ED%/}/usr/share/man\"" - "embedded_runpath_prefix=\"${EPREFIX}/usr\"" - "configs=${CONFIGS[*]}" - "new_dtags=yes" - "NOTEST=$(usex !test)" - "USE_READLINE=$(usex ncurses)" - "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 python/config/Make.rules || die "sed failed" - - if use python; then - local S="${S}/python" - python_copy_sources - fi - - if use ruby; then - SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" - MAKE_RULES_RUBY=( - "install_rubydir=\"${ED%/}/${SITERUBY}\"" - "install_libdir=\"${ED%/}/${SITERUBY}\"" - ) - - # make it use ruby22 only - sed -i \ - -e 's|RUBY = ruby|\022|' \ - ruby/config/Make.rules || die "sed failed" - sed -i \ - -e 's|env ruby|\022|' \ - ruby/config/s2rb.rb || die "sed failed" - sed -i \ - -e 's|env ruby|\022|' \ - ruby/scripts/slice2rb || die "sed failed" - sed -i \ - -e 's|output.write("ruby|\022|' \ - scripts/TestUtil.py || die "sed failed" - fi - - MAKE_RULES_MONO=( - "GACINSTALL=yes" - "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\"" - "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\"" - "install_libdir=\"${ED%/}/usr/$(get_libdir)\"" - "install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\"" - ) - - if has_version ">dev-lang/mono-4"; then - MAKE_RULES_MONO+=("MCS=mcs") - fi - - use test && python_setup -} - -src_compile() { - # Do not remove this export or build will break! - tc-export CXX - - emake -C cpp "${MAKE_RULES[@]}" srcs - - if use php; then - local i - for i in $(php_get_slots); do - mkdir -p "${WORKDIR}/${i}" || die - cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory" - - pushd "${WORKDIR}/${i}" >/dev/null || die - ln -s "${S}/cpp" || die - ln -s "${S}/config" || die - 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\"" - popd >/dev/null || die - done - fi - - if use python; then - building() { - emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}" - } - local S="${S}/python" - python_foreach_impl building - fi - - if use ruby; then - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" - fi - - if use mono; then - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" - fi -} - -src_test() { - local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - emake -C cpp "${MAKE_RULES[@]}" tests - - # php tests require the extension loaded and are therefore skipped - - if use python; then - testing() { - emake -C "${BUILD_DIR}" \ - "${MAKE_RULES[@]}" \ - PYTHON="${EPYTHON}" \ - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ - install_libdir="\"${D%/}/$(python_get_sitedir)\"" test - } - local S="${S}/python" - python_foreach_impl testing - fi - - if use ruby; then - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test - fi - - if use mono; then - # skip mono tests, bug #498484 - ewarn "Tests for C# are currently disabled." - #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test - fi -} - -src_install() { - local DOCS=( CHANGELOG*.md README.md ) - einstalldocs - - insinto /usr/share/${P} - doins -r slice - - emake -C cpp "${MAKE_RULES[@]}" install - find ${D}/usr/include ${D}/usr/share -type f -print0 | xargs -r0 chmod a-x - - if use examples; then - docinto examples-cpp - dodoc cpp/config/*.cfg - docompress -x /usr/share/doc/${PF}/examples-cpp - fi - - if use php; then - insinto "/usr/share/php/${PN}" - - local i - while IFS="" read -d $'\0' -r i; do - doins "${i}" - done < <(find "${S}/php/lib/" -name '*.php' -print0) - - pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die - - local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}" - for i in *; do - mkdir -p "${ED%/}/usr/share/php/${i}" || die - "${ED%/}"/usr/bin/slice2php \ - -I"${ED%/}/usr/share/${P}/slice/" --all \ - --output-dir "${ED%/}/usr/share/php/${i}" \ - --ice "${ED%/}/usr/share/${P}/slice/${i}"/* - done - - 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" - done - php-ext-source-r2_createinifiles - - popd >/dev/null || die - fi - - if use python; then - installation() { - mkdir -p "${D%/}/$(python_get_sitedir)" || die - - emake -C "${BUILD_DIR}" \ - "${MAKE_RULES[@]}" \ - install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ - install_libdir="\"${D%/}/$(python_get_sitedir)\"" \ - install - } - local S="${S}/python" - python_foreach_impl installation - fi - - if use ruby; then - dodir "${SITERUBY}" - emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install - fi - - if use mono; then - emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install - fi -} diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index 370ae9d..8b1607d 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -1,4 +1,5 @@ -DIST Ice-3.7.8.tar.gz 11056950 BLAKE2B 66686d6e66a997badef53ee30782775047a2fa39d70fa8ed73c5e7a1bad3c3899efd8d68f557a416caacd65860a73834a6bdc3188730fa19a3f1e47f028c5e21 SHA512 eb5863cb5e83000199c27a5a505a19e5f1ec05e8575eb9cdc03f6db30447212e3b02e6adc70fb2ae6ddc63cfd93bc2b6b290f38919364ee9f08b238a0aa11e88 +AUX Ice-3.7.8-fix-musl-build.patch 568 BLAKE2B e320641208d46b27acc68d932aed336bf74407e3db8351e59b43172be771fe80ba813e01812a40b2cd57bd8002a0fe707f9a32fdef3f7b323c8a764f7f1c5c97 SHA512 be19a21ff3d4ddafb9d1b9c866f392b3eb081e450b9a061884485b7713f06ad5a7c58a0275328de8bdf39d0bfb2fcc085583105f47cae51e6cae42651a04ed3e +AUX Ice-3.7.8-py3k11.patch 1500 BLAKE2B c7580ff44b3d29071f48c72c00069e9689d8e6d354027469b70c14b249bc1b8c4b7453df02a4282066869b936a3f71e850d17a93444f1b192ccfb9998d8e632b SHA512 ebe4e8458785d4191f42fca81995f31c9e7d6e9290a91491ef311b2104c193161b5d3a8489a34630e0d42cb9dd3870e3f48fe8089b8f0739afbe822e1a9db4fb +DIST Ice-3.7.1.pdf 9351739 BLAKE2B 527f2c37aea19aedbfc580efd93ce4fae2eb7264342bb485822593e2da6fb75a61eea2b1a46187898af07f138d10bf9a213d0b2a0685c18cd1d4c624709a935b SHA512 199b59f14b87b2896ba970bf5aa32f6fd858cbd3fed18eac93acafe4e296db1361ca2d2000ed49f3390ed66c1d4ff8c1fcd3f14ab8197d7804c87fce422c8486 DIST Ice-3.7.9.tar.gz 11098008 BLAKE2B f29013c0e58c83b26ee1b9c419a87a3e04e8e10a01220e2c0ab0e7cc2073cf4c6ad669ec73ccde8841272339557c54c29b94a91f2237760cc36b3f8336d43201 SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 -EBUILD Ice-3.7.8.ebuild 6704 BLAKE2B 2dfe948e9fbb448c3cbd670307db6a738bc7b5f819c38a696f4d01d991c9535e4a26a515291698f0356b96e0c6ce03bca44f159418a791a999d4e2aebdcab519 SHA512 8a48f2161eba99bb4df06cd5ddd4356dae594ae2a2e995847ecbb1828293b6b13f575c3dceeb384d97747ceb05fc9476bfae10286273fbe45354395355717c04 -EBUILD Ice-3.7.9.ebuild 6704 BLAKE2B 2dfe948e9fbb448c3cbd670307db6a738bc7b5f819c38a696f4d01d991c9535e4a26a515291698f0356b96e0c6ce03bca44f159418a791a999d4e2aebdcab519 SHA512 8a48f2161eba99bb4df06cd5ddd4356dae594ae2a2e995847ecbb1828293b6b13f575c3dceeb384d97747ceb05fc9476bfae10286273fbe45354395355717c04 +EBUILD Ice-3.7.9-r1.ebuild 6070 BLAKE2B e0e76cdf43357750bf1a45245bf04809f63e232d152348f7d6d58e01e703e5f5edf77538ce39688bf6e921ffb470c92f57cdb2a5fed4eaff028e80ee47c59a43 SHA512 86130166d6c97d8577a4be0f60fcad57edd487bb39f765f48cce7b7f4886bebf688367f995ccf5c7838ad9d6c840ab47e809fca296fc17db63f7a2dd07a329a3 diff --git a/dev-libs/Ice/files/Ice-3.7.9-fix-musl-build.patch b/dev-libs/Ice/files/Ice-3.7.9-fix-musl-build.patch new file mode 100644 index 0000000..76fa6c5 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.7.9-fix-musl-build.patch @@ -0,0 +1,13 @@ +https://github.com/void-linux/void-packages/blob/master/srcpkgs/Ice/patches/fix-musl.patch + +--- a/cpp/src/IceUtil/UtilException.cpp ++++ b/cpp/src/IceUtil/UtilException.cpp +@@ -43,7 +43,7 @@ + # endif + # endif + +-# if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) ++# if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS) && defined(__GLIBC__) + # include + # include + # include diff --git a/dev-libs/Ice/files/Ice-3.7.9-py3k11.patch b/dev-libs/Ice/files/Ice-3.7.9-py3k11.patch new file mode 100644 index 0000000..7295aa6 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.7.9-py3k11.patch @@ -0,0 +1,45 @@ +From a98f34df525dce54a96f443806599978b293d7c5 Mon Sep 17 00:00:00 2001 +From: Jose +Date: Thu, 3 Nov 2022 16:52:58 +0100 +Subject: [PATCH] Python 3.11 build fixes (#1394) + +--- + python/modules/IcePy/Slice.cpp | 7 ++++++- + python/modules/IcePy/Util.cpp | 5 +++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp +index e11365d8d40..7138e76dac0 100644 +--- a/python/modules/IcePy/Slice.cpp ++++ b/python/modules/IcePy/Slice.cpp +@@ -14,7 +14,12 @@ + // Python headers needed for PyEval_EvalCode. + // + #include +-#include ++// Use ceval.h instead of eval.h with Pyhthon 3.11 and greater ++#if PY_VERSION_HEX >= 0x030B0000 ++# include ++#else ++# include ++#endif + + using namespace std; + using namespace IcePy; +diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp +index f15c7a5c690..73955c933a2 100644 +--- a/python/modules/IcePy/Util.cpp ++++ b/python/modules/IcePy/Util.cpp +@@ -225,7 +225,12 @@ IcePy::getFunction() + // + // Get name of current function. + // ++ // Use PyEval_GetFrame with Pyhthon >= 3.11 ++#if PY_VERSION_HEX >= 0x030B0000 ++ PyFrameObject *f = PyEval_GetFrame(); ++#else + PyFrameObject *f = PyThreadState_GET()->frame; ++#endif + PyObjectHandle code = getAttr(reinterpret_cast(f), "f_code", false); + assert(code.get()); + PyObjectHandle func = getAttr(code.get(), "co_name", false); -- cgit v1.2.3