From f494d619a2b342f7e5f4353788bfeaaf0811f161 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 11 Mar 2017 19:33:18 -0800 Subject: dev-libs/efl: add USE=unwind to control libunwind dep #611108 --- dev-libs/efl/efl-1.17.0-r1.ebuild | 10 +++++++++- dev-libs/efl/efl-9999.ebuild | 10 +++++++++- dev-libs/efl/metadata.xml | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild index 21a45a95a331..9d3d409157cc 100644 --- a/dev-libs/efl/efl-1.17.0-r1.ebuild +++ b/dev-libs/efl/efl-1.17.0-r1.ebuild @@ -22,7 +22,7 @@ inherit enlightenment pax-utils DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" -IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l valgrind wayland webp X xim xine xpm" +IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" REQUIRED_USE=" @@ -76,6 +76,7 @@ RDEPEND=" systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) + unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 @@ -176,6 +177,13 @@ src_prepare() { -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \ -e '/BARF_OK=/s:=.*:=:' \ configure || die + + # Upstream doesn't offer a configure flag. #611108 + if ! use unwind ; then + sed -i \ + -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ + configure || die + fi } src_configure() { diff --git a/dev-libs/efl/efl-9999.ebuild b/dev-libs/efl/efl-9999.ebuild index 4bf654c48161..e051bea2d47c 100644 --- a/dev-libs/efl/efl-9999.ebuild +++ b/dev-libs/efl/efl-9999.ebuild @@ -22,7 +22,7 @@ inherit enlightenment pax-utils DESCRIPTION="Enlightenment Foundation Libraries all-in-one package" LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB" -IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib v4l valgrind wayland webp X xim xine xpm" +IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm" REQUIRED_USE=" pulseaudio? ( sound ) @@ -76,6 +76,7 @@ RDEPEND=" systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) + unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 @@ -174,6 +175,13 @@ src_prepare() { -e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \ -e '/BARF_OK=/s:=.*:=:' \ configure || die + + # Upstream doesn't offer a configure flag. #611108 + if ! use unwind ; then + sed -i \ + -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \ + configure || die + fi } src_configure() { diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml index 61f2879cfd46..24801d968fbe 100644 --- a/dev-libs/efl/metadata.xml +++ b/dev-libs/efl/metadata.xml @@ -24,6 +24,7 @@ Enable Smart Common Input Method Enable Tga image loader Enable x11-libs/tslib for touchscreen events + Enable debug support via sys-libs/libunwind Enable usage of dev-util/valgrind in debug Enable WebP image loader Enable X Input Method -- cgit v1.2.3-65-gdbad