diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-09 20:55:12 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-09 20:55:12 +0000 |
| commit | 3dfbb844b3292a559eb677078928b433a7144419 (patch) | |
| tree | ede5538f2c621ad99c19864dfb7b53d847637711 /sci-geosciences | |
| parent | Initial import (diff) | |
| download | gentoo-2-3dfbb844b3292a559eb677078928b433a7144419.tar.gz gentoo-2-3dfbb844b3292a559eb677078928b433a7144419.tar.bz2 gentoo-2-3dfbb844b3292a559eb677078928b433a7144419.zip | |
Do not allow pollution of CLIBS variable. Fixes bug #370463.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gpscorrelate/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sci-geosciences/gpscorrelate/ChangeLog b/sci-geosciences/gpscorrelate/ChangeLog index de20c06f083b..98d499a1d3a0 100644 --- a/sci-geosciences/gpscorrelate/ChangeLog +++ b/sci-geosciences/gpscorrelate/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/gpscorrelate # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.10 2011/06/08 12:22:57 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpscorrelate/ChangeLog,v 1.11 2011/06/09 20:55:12 scarabeus Exp $ + + 09 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> + files/gpscorrelate-1.6.1-makefile.patch: + Do not allow pollution of CLIBS variable. Fixes bug #370463. 08 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> gpscorrelate-1.6.1.ebuild, files/gpscorrelate-1.6.1-makefile.patch: diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch index 14b00c92b74c..f48dba1882f2 100644 --- a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch +++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch @@ -12,7 +12,7 @@ diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile -prefix = /usr/local +CFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2 +CXXFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2 -+CLIBS += $(shell pkg-config --libs libxml-2.0) -lm -lexiv2 -lstdc++ ++CLIBS = $(shell pkg-config --libs libxml-2.0) -lm -lexiv2 -lstdc++ +ifdef BUILD_GUI +CXXFLAGS += $(shell pkg-config --cflags gtk+-2.0) +CFLAGS += $(shell pkg-config --cflags gtk+-2.0) |