Update -Wl,--as-needed patch with OpenMP library finding code from ImageMagick's...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-libs/minuit/ChangeLog b/sci-libs/minuit/ChangeLog
index a2c6151205a7e222dea1821767d03dfe2055b1ad..84c4116de91cdedfc815d637eeec4a931dd392d6 100644 (file)
--- a/sci-libs/minuit/ChangeLog
+++ b/sci-libs/minuit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/minuit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.13 2010/06/02 13:14:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.14 2010/07/01 17:11:42 ssuominen Exp $
+
+  01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/minuit-5.27.02-asneeded.patch:
+  Update -Wl,--as-needed patch with OpenMP library finding code from
+  ImageMagick's configure.ac wrt #314095.
 
   02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> minuit-5.27.02.ebuild:
   Use tc-has-openmp rather than built_with_use

diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest
index 836e936298205b713ade7a87d098cc10e8f4cdf0..def5c34ef9abd7efa5238014e9c85ca17d1db884 100644 (file)
--- a/sci-libs/minuit/Manifest
+++ b/sci-libs/minuit/Manifest
@@ -1,7 +1,7 @@
-AUX minuit-5.27.02-asneeded.patch 768 RMD160 6e242b131ce3642f385e284e2464ed25e0b19988 SHA1 8d3dbea62742666b5cd273b554f0382acdab54ee SHA256 4dc209f8c98d06a38c0c1270f5d3a96b359b468276d44cd7969b178a7b4c5e36
+AUX minuit-5.27.02-asneeded.patch 1172 RMD160 a106078495b6b8f6cd12edb80c4a55764b33d3de SHA1 fe59c99ca777a2a88d2de8deeb1a34221e10e073 SHA256 940d489f596eb6152f16cccb2ebe7bde77b10b9d93bba60fafbc6a1e95e3fa2f
 DIST Minuit2-5.27.02.tar.gz 489449 RMD160 9c342e23b4c2e53de20e21c7365dac9881b98a83 SHA1 439ad7db29ddd7781469346a994cd6b5fd3816bf SHA256 262e2a014f17dd54535b71efc69d1ee6318e6109a57dbe376b416247a031ad5e
 DIST mntutorial.pdf 263735 RMD160 4ef7806018a0ac43e322325ab9ea716268ac65cd SHA1 c32bdc4fb130ea8baa32e5dd79a7bc701b313110 SHA256 a72207746c548f4b468b147c27552b4a1bc9762df2a19f9cb0f9ec297899ef07
 DIST mnusersguide.pdf 260072 RMD160 d3809c8c7f0b105fef61f23c63708ff926853c37 SHA1 ac8b0b8464c8cfd2d02bbdb14e97be6271272259 SHA256 cffef5faa1c4d6ac589d4bd40ea474302f55fab47ab2e711b37f1183870fb206
 EBUILD minuit-5.27.02.ebuild 1749 RMD160 f30b15ad800a4d019ee3c6eaa3a0ff94a19d430e SHA1 647ee62b28422844b4fafe18b4e75aebf61fd707 SHA256 e709fea14957cc8bea1f4019ffe39e35b11348eb2361497d3a998a5b126f40f6
-MISC ChangeLog 2368 RMD160 bac256163be2be0a2880fe2b1a69063d246e386f SHA1 adbe3eb564bb46148937f710b1c71126c127a284 SHA256 1a2aa9bdf9976c2d3a9dcd31310cad9812638a4ad21fb6a5ac0693df6c74bfdb
+MISC ChangeLog 2572 RMD160 69f274962db680d62d535a50ce996451df62d50b SHA1 0abdcccdd5d007bf752089a0245ed8cbba28a074 SHA256 65eaef21567a6bc0db30c72fa4ffde54bb1e4c3297a17a4f7d97ace4aca14b82
 MISC metadata.xml 525 RMD160 73232a63d390b0f64f8679059782d1c96358b425 SHA1 0ab5b599239adfb9896c7b71663a42564adb06f4 SHA256 9d2450a7a5feb0c357ed37375083fd55b34fd7caedee2a7b058e5eaea4616866

diff --git a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
index ba5ab50d635d93a67cf1f85613e8f0b551028231..b9b8b4b5bb5d12b2dc1a29c3278756e0d166db2d 100644 (file)
--- a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
+++ b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
@@ -1,28 +1,38 @@
-Workaround for as-needed failure. It's not a proper patch!
-If you know how to do it better, please do!
+This OpenMP library finding code is from ImageMagick's configure.ac
 
-http://bugs.gentoo.org/show_bug.cgi?id=314095
+http://bugs.gentoo.org/314095
 
+--- configure.in
++++ configure.in
+@@ -44,6 +44,20 @@
+ CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+ 
++dnl Find OpenMP library
++GOMP_LIBS=''
++if test "$enable_openmp" != 'no'; then
++  if test "${GCC}" = "yes"; then
++    AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,)  # gcc
++  else
++    AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,)  # solaris cc
++    AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,)  # AIX xlc
++    AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,)  # SGI IRIX 6.5 MIPSpro C/C++
++  fi
++  LIBS="$GOMP_LIBS $LIBS"
++fi
++AC_SUBST(GOMP_LIBS)
++
+ dnl files to be generated 
+ AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile 
+   doc/Doxyfile doc/Makefile test/Makefile test/MnSim/Makefile 
 --- src/Makefile.am
 +++ src/Makefile.am
-@@ -9,6 +9,10 @@
+@@ -9,6 +9,8 @@
  # The convenience library to be built.
  lib_LTLIBRARIES = libMinuit2.la
  
-+if GNUOPENMP
-+  libMinuit2_la_LIBADD = -lgomp
-+endif
++libMinuit2_la_LIBADD = $(GOMP_LIBS)
 +
  libMinuit2_la_SOURCES =                               \
           AnalyticalGradientCalculator.cxx     \
           BasicMinimumError.cxx                        \
---- configure.in
-+++ configure.in
-@@ -43,6 +43,7 @@
- AC_OPENMP
- CFLAGS="$CFLAGS $OPENMP_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-+AM_CONDITIONAL(GNUOPENMP, test "x$OPENMP_CXXFLAGS" = "x-fopenmp")
- 
- dnl files to be generated 
- AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile