| 1 |
ssuominen 10/07/01 17:11:42 |
| 2 |
|
| 3 |
Modified: minuit-5.27.02-asneeded.patch |
| 4 |
Log: |
| 5 |
Update -Wl,--as-needed patch with OpenMP library finding code from ImageMagick's configure.ac wrt #314095. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-libs/minuit/files/minuit-5.27.02-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: minuit-5.27.02-asneeded.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- minuit-5.27.02-asneeded.patch 2 Jun 2010 09:51:03 -0000 1.1 |
| 22 |
+++ minuit-5.27.02-asneeded.patch 1 Jul 2010 17:11:42 -0000 1.2 |
| 23 |
@@ -1,28 +1,38 @@ |
| 24 |
-Workaround for as-needed failure. It's not a proper patch! |
| 25 |
-If you know how to do it better, please do! |
| 26 |
+This OpenMP library finding code is from ImageMagick's configure.ac |
| 27 |
|
| 28 |
-http://bugs.gentoo.org/show_bug.cgi?id=314095 |
| 29 |
+http://bugs.gentoo.org/314095 |
| 30 |
|
| 31 |
+--- configure.in |
| 32 |
++++ configure.in |
| 33 |
+@@ -44,6 +44,20 @@ |
| 34 |
+ CFLAGS="$CFLAGS $OPENMP_CFLAGS" |
| 35 |
+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
| 36 |
+ |
| 37 |
++dnl Find OpenMP library |
| 38 |
++GOMP_LIBS='' |
| 39 |
++if test "$enable_openmp" != 'no'; then |
| 40 |
++ if test "${GCC}" = "yes"; then |
| 41 |
++ AC_CHECK_LIB(gomp,GOMP_parallel_start,GOMP_LIBS="-lgomp",,) # gcc |
| 42 |
++ else |
| 43 |
++ AC_CHECK_LIB(mtsk,sunw_mp_register_warn,GOMP_LIBS="-lmtsk",,) # solaris cc |
| 44 |
++ AC_CHECK_LIB(xlsmp,_xlsmpFlush,GOMP_LIBS="-lxlsmp",,) # AIX xlc |
| 45 |
++ AC_CHECK_LIB(mp,mp_destroy,GOMP_LIBS="-lmp",,) # SGI IRIX 6.5 MIPSpro C/C++ |
| 46 |
++ fi |
| 47 |
++ LIBS="$GOMP_LIBS $LIBS" |
| 48 |
++fi |
| 49 |
++AC_SUBST(GOMP_LIBS) |
| 50 |
++ |
| 51 |
+ dnl files to be generated |
| 52 |
+ AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile |
| 53 |
+ doc/Doxyfile doc/Makefile test/Makefile test/MnSim/Makefile |
| 54 |
--- src/Makefile.am |
| 55 |
+++ src/Makefile.am |
| 56 |
-@@ -9,6 +9,10 @@ |
| 57 |
+@@ -9,6 +9,8 @@ |
| 58 |
# The convenience library to be built. |
| 59 |
lib_LTLIBRARIES = libMinuit2.la |
| 60 |
|
| 61 |
-+if GNUOPENMP |
| 62 |
-+ libMinuit2_la_LIBADD = -lgomp |
| 63 |
-+endif |
| 64 |
++libMinuit2_la_LIBADD = $(GOMP_LIBS) |
| 65 |
+ |
| 66 |
libMinuit2_la_SOURCES = \ |
| 67 |
AnalyticalGradientCalculator.cxx \ |
| 68 |
BasicMinimumError.cxx \ |
| 69 |
---- configure.in |
| 70 |
-+++ configure.in |
| 71 |
-@@ -43,6 +43,7 @@ |
| 72 |
- AC_OPENMP |
| 73 |
- CFLAGS="$CFLAGS $OPENMP_CFLAGS" |
| 74 |
- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" |
| 75 |
-+AM_CONDITIONAL(GNUOPENMP, test "x$OPENMP_CXXFLAGS" = "x-fopenmp") |
| 76 |
- |
| 77 |
- dnl files to be generated |
| 78 |
- AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile |
Archives