summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-02-20 17:06:36 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-02-20 17:06:36 +0000
commitf81c2e032b38cf26bc1ef4acf9d47be515fdf719 (patch)
tree95c64c2973254f46f0bd96c435381ed16972d422 /sci-libs/netcdf-cxx
parentadd TeamViewer license to @EULA (diff)
downloadgentoo-2-f81c2e032b38cf26bc1ef4acf9d47be515fdf719.tar.gz
gentoo-2-f81c2e032b38cf26bc1ef4acf9d47be515fdf719.tar.bz2
gentoo-2-f81c2e032b38cf26bc1ef4acf9d47be515fdf719.zip
Avoid infinite loop with netcdf (bug #456916)
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs/netcdf-cxx')
-rw-r--r--sci-libs/netcdf-cxx/ChangeLog6
-rw-r--r--sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch2
2 files changed, 6 insertions, 2 deletions
diff --git a/sci-libs/netcdf-cxx/ChangeLog b/sci-libs/netcdf-cxx/ChangeLog
index ee79b4e54d8f..dd0baa254103 100644
--- a/sci-libs/netcdf-cxx/ChangeLog
+++ b/sci-libs/netcdf-cxx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/netcdf-cxx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/ChangeLog,v 1.3 2013/01/10 18:55:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf-cxx/ChangeLog,v 1.4 2013/02/20 17:06:36 bicatali Exp $
+
+ 20 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+ files/netcdf-cxx-4.2-config.patch:
+ Avoid infinite loop with netcdf (bug #456916)
*netcdf-cxx-4.2-r1 (10 Jan 2013)
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
index 9de8442516b5..7d83b6d0dfc1 100644
--- a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
+++ b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
@@ -14,7 +14,7 @@
cflags=" -I${includedir} @CPPFLAGS@"
fflags="@FFLAGS@ @MOD_FLAG@${includedir}"
-libs="-L${libdir} @NC_LIBS@"
-+libs="-L${libdir} @NC_LIBS@ $(nc-config --libs)"
++libs="-L${libdir} @NC_LIBS@ -lnetcdf"
flibs="-L${libdir} @NC_FLIBS@"
has_dap="@HAS_DAP@"
has_nc2="@HAS_NC2@"