commit: 75aebadc586d4bbce67e1bb948a10da28b5c703d Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Jun 13 20:11:50 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Jun 13 20:13:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75aebadc
x11-libs/cairo: detect 'strings' with AC_CHECK_TOOL This way all binutils tools are detected with $CHOST prefix if exist. Fixes 64-bit build on sys-devel/binutils-config[-native-symlinks] system. Closes: https://bugs.gentoo.org/726200 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> x11-libs/cairo/cairo-1.16.0-r4.ebuild | 135 ++++++++++++++++++++++++ x11-libs/cairo/files/cairo-1.16.0-strings.patch | 19 ++++ 2 files changed, 154 insertions(+) diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r4.ebuild new file mode 100644 index 00000000000..d9108285f73 --- /dev/null +++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic autotools multilib-minimal + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git"; + SRC_URI="" +else + SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A vector graphics library with cross-device output support" +HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo"; +LICENSE="|| ( LGPL-2.1 MPL-1.1 )" +SLOT="0" +IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind" +# gtk-doc regeneration doesn't seem to work with out-of-source builds +#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate + +# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it +RESTRICT="test" + +BDEPEND=" + virtual/pkgconfig + >=sys-devel/libtool-2" +RDEPEND=" + >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] + sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}] + gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) + opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto )" +#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} +# doc? ( +# >=dev-util/gtk-doc-1.6 +# ~app-text/docbook-xml-dtd-4.2 +# )" + +REQUIRED_USE=" + gles2-only? ( !opengl ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch + "${FILESDIR}"/${PN}-respect-fontconfig.patch + "${FILESDIR}"/${P}-pdf-add-missing-flush.patch + "${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch + "${FILESDIR}"/${P}-strings.patch +) + +src_prepare() { + default + + if has_version ">=sys-libs/binutils-libs-2.34"; then + eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch + fi + + # tests and perf tools require X, bug #483574 + if ! use X; then + sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die + fi + + # Slightly messed build system YAY + if [[ ${PV} == *9999* ]]; then + touch boilerplate/Makefile.am.features + touch src/Makefile.am.features + touch ChangeLog + fi + + eautoreconf +} + +multilib_src_configure() { + local myopts + + [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT + + use elibc_FreeBSD && myopts+=" --disable-symbol-lookup" + + # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)" + + ECONF_SOURCE="${S}" \ + econf \ + $(use_with X x) \ + $(use_enable X tee) \ + $(use_enable X xlib) \ + $(use_enable X xlib-xrender) \ + $(use_enable X xcb) \ + $(use_enable X xcb-shm) \ + $(use_enable aqua quartz) \ + $(use_enable aqua quartz-image) \ + $(use_enable debug test-surfaces) \ + $(use_enable gles2-only glesv2) \ + $(use_enable glib gobject) \ + $(use_enable opengl gl) \ + $(use_enable static-libs static) \ + $(use_enable svg) \ + $(use_enable utils trace) \ + $(use_enable valgrind) \ + --enable-ft \ + --enable-interpreter \ + --enable-pdf \ + --enable-png \ + --enable-ps \ + --enable-script \ + --disable-drm \ + --disable-directfb \ + --disable-gallium \ + --disable-qt \ + --disable-vg \ + --disable-xlib-xcb \ + ${myopts} +} + +multilib_src_install_all() { + find "${D}" -name '*.la' -delete || die + einstalldocs +} diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch b/x11-libs/cairo/files/cairo-1.16.0-strings.patch new file mode 100644 index 00000000000..ee72f9dec7c --- /dev/null +++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/726200 +--- a/build/aclocal.float.m4 ++++ b/build/aclocal.float.m4 +@@ -31,10 +31,13 @@ int main() { return 0; } + + ]])], [ + +-if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then ++# allow users to override default 'strings' with 'llvm-strings' ++# or ${CHOST}-strings. ++AC_CHECK_TOOL(STRINGS, strings) ++if $STRINGS -a conftest$ac_exeext | grep noonsees >/dev/null ; then + ax_cv_c_float_words_bigendian=yes + fi +-if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then ++if $STRINGS -a conftest$ac_exeext | grep seesnoon >/dev/null ; then + if test "$ax_cv_c_float_words_bigendian" = unknown; then + ax_cv_c_float_words_bigendian=no + else
