From 3a05aec1751a55c7f15366a08b122d63cf7653a7 Mon Sep 17 00:00:00 2001 From: Kacper Kowalik Date: Wed, 2 Jan 2013 17:24:54 +0000 Subject: Reintroduce autotools workaround for IUSE="-ifortran" wrt #448726 c#2 by Vicente Olivert Riera (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 895192F9) --- sci-libs/hdf/ChangeLog | 9 +++++++-- sci-libs/hdf/files/4.2.7_p1-autotools.patch | 13 ------------- 2 files changed, 7 insertions(+), 15 deletions(-) (limited to 'sci-libs') diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog index adb63cbe2b6f..8d97164ca71d 100644 --- a/sci-libs/hdf/ChangeLog +++ b/sci-libs/hdf/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/hdf -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.30 2012/12/30 15:00:11 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.31 2013/01/02 17:24:54 xarthisius Exp $ + + 02 Jan 2013; Kacper Kowalik + files/4.2.7_p1-autotools.patch: + Reintroduce autotools workaround for IUSE="-ifortran" wrt #448726 c#2 by + Vicente Olivert Riera 30 Dec 2012; Agostino Sarubbo hdf-4.2.8.ebuild: Stable for amd64, wrt bug #449226 diff --git a/sci-libs/hdf/files/4.2.7_p1-autotools.patch b/sci-libs/hdf/files/4.2.7_p1-autotools.patch index a7ea40e5e268..6ae9ccfc64e5 100644 --- a/sci-libs/hdf/files/4.2.7_p1-autotools.patch +++ b/sci-libs/hdf/files/4.2.7_p1-autotools.patch @@ -114,16 +114,3 @@ diff -Nur hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am hdf-4.2.7-patch1/mfhdf/ endif if HDF_BUILD_NETCDF -@@ -50,11 +51,7 @@ - # fortran has been disabled in configure. The Fortran linker gets confused - # when shared libraries are enabled, so when Fortran is not enabled, - # this replaces the Fortran link macro with the C link macro. --if HDF_BUILD_FORTRAN -- # do nothing --else -- F77LINK = $(LINK) --endif -+ - - ############################################################################# - ## And the cleanup ## -- cgit v1.2.3-65-gdbad