From 5d53123b54d7b88d5a813f33c050db9351e36b4c Mon Sep 17 00:00:00 2001 From: Serkan Kaba Date: Thu, 27 Nov 2008 18:32:35 +0000 Subject: Fix compilation with --as-needed reported in bug #248537. Don't compile tests when not needed. Thanks to Diego Pettenò for the report and help. (Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x11-libs/gtkhotkey/ChangeLog | 8 ++- .../files/gtkhotkey-0.2.0-buildfixes.patch | 59 ++++++++++++++++++++++ x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild | 11 +++- 3 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-buildfixes.patch (limited to 'x11-libs/gtkhotkey') diff --git a/x11-libs/gtkhotkey/ChangeLog b/x11-libs/gtkhotkey/ChangeLog index 9fbdcd5a2eeb..d4fd78bae27a 100644 --- a/x11-libs/gtkhotkey/ChangeLog +++ b/x11-libs/gtkhotkey/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-libs/gtkhotkey # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/ChangeLog,v 1.2 2008/11/09 15:28:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/ChangeLog,v 1.3 2008/11/27 18:32:35 serkan Exp $ + + 27 Nov 2008; Serkan Kaba + +files/gtkhotkey-0.2.0-buildfixes.patch, gtkhotkey-0.2.0.ebuild: + Fix compilation with --as-needed reported in bug #248537. Don't compile + tests when not needed. Thanks to Diego Pettenò for + the report and help. 09 Nov 2008; Markus Meier gtkhotkey-0.2.0.ebuild: add ~x86, bug #246077 diff --git a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-buildfixes.patch b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-buildfixes.patch new file mode 100644 index 000000000000..2b13aff4f02c --- /dev/null +++ b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.0-buildfixes.patch @@ -0,0 +1,59 @@ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: serkan@gentoo.org-20081126194218-u376kxy72v0dx7dc +# target_branch: ../gtkhotkey/ +# testament_sha1: 06ccd01bc7499075c62274cb25269a005b0c5efd +# timestamp: 2008-11-26 23:41:48 +0200 +# base_revision_id: mikkel.kamstrup@gmail.com-20081028221117-\ +# 90lhle1k6yd06j6f +# +# Begin patch +=== modified file 'test/Makefile.am' +--- test/Makefile.am 2008-10-27 21:09:19 +0000 ++++ test/Makefile.am 2008-11-26 19:42:18 +0000 +@@ -11,11 +11,11 @@ + -Wall\ + -g + +-gtk_hotkey_libs = $(top_builddir)/src/libgtkhotkey.la ++gtk_hotkey_libs = $(top_builddir)/src/libgtkhotkey.la $(GTK_HOTKEY_LIBS) + + helper_sources = + +-noinst_PROGRAMS = $(TEST_PROGS) test-interactive test-interactive-multi ++check_PROGRAMS = $(TEST_PROGS) test-interactive test-interactive-multi + + test_interactive_SOURCES = test-interactive.c $(helper_sources) + test_interactive_LDADD = $(gtk_hotkey_libs) + +# Begin bundle +IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSAaPjsAA8nfgCAQVeP////v +//C////wYAdO+NAAAVBAKAUBCSUFN6hPRtTQKeEZNMFNPAmpibUemp6aR6QNMcZMmhiMTRgEYCYQ +BgJpo0yNAMcZMmhiMTRgEYCYQBgJpo0yNAMNQ1QGmgD9SGjQADQAAaAAABxkyaGIxNGARgJhAGAm +mjTI0AwVSJoEZABNACaNGmp6jFNPE01A8mRkaak8FMVHyj32iXygPTaczN6qyTiG1KZfCgKQGSiG +OWlqIIBvCSpFlIfBAfpQBIMkEFGoOgVh2KCxmROVQkbVvKXLEkpSlHz7HKj5vpYuasZVb0lUqKJv +boyMrwPzKnrRR/5utzPnrf2+M0pJxOl31rPkkUwSdWHzStsLpHtY7dk8PU6Xmci13U55Su10nVSr +qIpTKVyGJCMymGHsZxmu+xegr6AQZRZBUBXCsgghDoMVGmEcuR/DiR25xxrSe3jvRj9YUlDr9Ajx +bOB+z186/2RDDdlmnOePk07I2MSOKjzwjbT2Ld6BlU3qZEoWosd6Mq20vygyW9qTxoy1sSdPsPCp +i/Fbc0Gv9WhFEojT2O5FUe9tho24JlUIZzN4Jwhfbg5dxhkYJxkJtqjUmrymWEURU32Cp2bWirMM +FciuuzW4lGc17F0nEtTBa0SV0vLmhpFWBmvYJ+eqEZZDar2rm7roZsF0HpqbWycFMxajOzLqNVia +iUrE6mn7DIm4GR5oRRmtjNCJH8s6oamTZgi1SmE7YR5TejLVg27aI3NutrpOVhdEW5YRctX6aZzN +mNUIqYZ8/20VNLcnXCMyktO5GlzKV6BhfWaVF9v8tWmxRWk3sUodHnbrVc42tX21yisyj3eoxX3y +SJ7krHI1zk7Bxa10Iz4zRot1sRgq4KmplLB6LVr0jjzLYRlYRDKxgKrjFc5FViizWoo1tDI0tJP9 +bFFTMryN1PJX2quVY8hwTRkS0tUItF+C1YyZHLceFrkhGUvcbB3r1rrxVyWF1xIkKuMwOKCz0mh6 +jnxlMj3JQ8bOzrjoRwVTiV5rklKFznbjc9CpcmqktSVKR4UiIYQ+Lf+D2+/J/HlfT2PeeDh8nc7s +qlgZmEyN4fejq5T4TlIFXhnjHntRqf2qOGJpB8K9+JqfV/XS13vPzO7c2GtH0Vo/pOrvU6H99W19 +8PD4XuU8Wnr6AoU7PkzyTB31INJGa/h+9RzhSC2MdjGHqY0XKkYm8ykKV5Y7ePA8KHqFYv4C53Zy +tmn58BMBaVwyZZxjlB16gWw78RrxFepf23uNUpjacGYg03307sOYmE8gQdcJj3RxMzEvE3DuYRvs +w74/NCbRGRkJo3DtXcrBOyelfWRbN5YCJBsRhGDx4CuIthdElOMKkEoMZuMkLnp6HmiI5edUyu50 +P2sc3vWW7ORJ+k/dP4GAvnGyU+xeqVJ4sr3z58zwRJNPnRNTm3tWe/JU6bIexuRW0o7bGrhObzmF +NcUZoVKCZwqeJnXyiExR6NbO79i40ydZmq/13jzXPR4SmjolKWD748yVDBUxp0tXI2cK+lwfg7Yf +wVuKTvPhpVwZsn/XdxN215MSbk0nBt8IhfejWrZxHIiZGTbsOP2pREPg5UPFDKWIkk+ORBMZ1Gtz ++Hq3NaSXBOO1401XW6b+dKMvUaj6KkeZ3uRLh0zGom3uUTIRnaZC/6SNFiY/MSHjj/Evxcaik8hY +R0vh8e8rdXqnX9fXfiiXdNvyRLF9GVD70uOUxdsOSG7pIsgc+uDPi+XxdaixgQx8EGZ+TBjFjZ4y +ri4R6zgnd2Q3wRvRuhSOEHVD2KOEIzCkO2GkfrhSIeok/A93Hjn6DtbOIq93PuWo90KQjddDB6Vs +LYip1NB5bJR0sq1UVwicOE5qOLPOIVREPxmNkMyi2CijgqvfzJkRXfMrSRESkR8k3LJH5dyOzARu +3dcRa+UkHpdgiuUkLpwdYicR1vXRGGFI/enI44fOzdHQ6HOLTvsQxvyOHIZRSWxW2xS9NGvAXTGw +3KAjQbF1PMo4SeYw3taSKl4jJbbOCKojZTYhRRIlJFtcKkbjGulR45ynUqJLdXdTQdSLTj/tpjN5 +SdCUVVRPx6lZsay1ZU4kdaRFbMLlmoi+DGE06XNv352o3POtJcnFY/2WkjOqbWxC4lLDEqP0hHEz +VpXCP8YQTRl451REjJIb3JqfvWjrGtFr4/mjydR5jmvRm0L4943ufUURNBvR4eLhbvhHkaRkd1+X +GyvAXDOriqbm6B8IRXFVdbSGrahU+hc6pCce4u5IpwoSBANHx2A= diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild index 95f3fdaef5a3..514f26386336 100644 --- a/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild +++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild,v 1.3 2008/11/09 15:28:09 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkhotkey/gtkhotkey-0.2.0.ebuild,v 1.4 2008/11/27 18:32:35 serkan Exp $ -inherit versionator +EAPI="2" + +inherit versionator eutils autotools MY_CRV=$(get_version_component_range 1-2) @@ -26,6 +28,11 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35.0 sys-devel/gettext" +src_prepare() { + epatch "${FILESDIR}"/${P}-buildfixes.patch + eautoreconf +} + src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed" -- cgit v1.2.3-65-gdbad