diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2011-04-25 03:04:19 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2011-04-25 03:04:19 +0000 |
| commit | e4c451dc7c20b479079adf6e4aff168633b9740e (patch) | |
| tree | 192ec2dcfad8f1b305b2b8e547844553caaf07e5 /sys-power | |
| parent | Don't install libs into /usr/lib6464 (bug #364741) (diff) | |
| download | gentoo-2-e4c451dc7c20b479079adf6e4aff168633b9740e.tar.gz gentoo-2-e4c451dc7c20b479079adf6e4aff168633b9740e.tar.bz2 gentoo-2-e4c451dc7c20b479079adf6e4aff168633b9740e.zip | |
Build with USE=gtk again. Oops. Respect more CFLAGS (bug #364667).
(Portage version: 2.2.0_alpha30/cvs/Linux i686)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/nvclock/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch | 25 | ||||
| -rw-r--r-- | sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/sys-power/nvclock/ChangeLog b/sys-power/nvclock/ChangeLog index e85bf4f343b1..c6563de2146a 100644 --- a/sys-power/nvclock/ChangeLog +++ b/sys-power/nvclock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-power/nvclock # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.7 2011/04/25 02:30:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.8 2011/04/25 03:04:19 jer Exp $ + + 25 Apr 2011; Jeroen Roovers <jer@gentoo.org> nvclock-0.8_p20110102-r1.ebuild, + files/nvclock-0.8_p20110102-make.patch: + Build with USE=gtk again. Oops. Respect more CFLAGS (bug #364667). 25 Apr 2011; Jeroen Roovers <jer@gentoo.org> nvclock-0.8_p20110102-r1.ebuild: Fix parallel make thanks to Diego Elio Pettenò (bug #351231). diff --git a/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch b/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch index e332d38a2c3f..f0d0ab7652f3 100644 --- a/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch +++ b/sys-power/nvclock/files/nvclock-0.8_p20110102-make.patch @@ -1,7 +1,7 @@ - Fix building with --as-needed - Fix parallel make by defining two new targets - Fix one spelling error -- Respect LDFLAGS +- Respect CFLAGS, LDFLAGS --- a/configure.in 2011-01-02 19:48:13.000000000 +0100 +++ b/configure.in 2011-01-03 04:35:34.000000000 +0100 @@ -67,3 +67,26 @@ clean: rm -f nvclock_qt *.core *.moc *.o +--- a/src/backend/Makefile.in 2011-01-02 19:48:13.000000000 +0100 ++++ b/src/backend/Makefile.in 2011-04-25 05:00:22.000000000 +0200 +@@ -1,11 +1,11 @@ +-CC=@CC@ -O0 ++CC=@CC@ + AR=ar + RANLIB=@RANLIB@ + + system=@system@ + HAVE_NVCONTROL=@HAVE_NVCONTROL@ + OBJECTS=backend.o bios.o config.o error.o nv30.o nv40.o nv50.o info.o overclock.o utils.o i2c.o xf86i2c.o adt7473.o f75375.o lm99.o w83781d.o w83l785r.o libc_wrapper.o +-CFLAGS=@X11_CFLAGS@ -I../.. -I../nvcontrol ++CFLAGS= @CFLAGS@ -O0 @X11_CFLAGS@ -I../.. -I../nvcontrol + + ifeq ($(system), FreeBSD) + OBJECTS+=back_bsd.o +@@ -40,4 +40,4 @@ + rm -f Makefile + + install: +-uninstall: +\ No newline at end of file ++uninstall: diff --git a/sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild b/sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild index c68a446ad5ea..e21dd1fe167f 100644 --- a/sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild +++ b/sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild,v 1.3 2011/04/25 02:30:52 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/nvclock-0.8_p20110102-r1.ebuild,v 1.4 2011/04/25 03:04:19 jer Exp $ EAPI="2" @@ -30,6 +30,9 @@ src_configure() { src_compile() { emake -C src/ nvclock smartdimmer || die + if use gtk; then + emake -C src/gtk/ || die + fi } src_install() { |