diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-10-24 11:53:22 +0200 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-10-24 11:53:22 +0200 |
| commit | dac6bba2f486cfde36b821d20439241680ee4ddb (patch) | |
| tree | 275b4ae93ffc211a9b94edefdb8a4849df2c70d7 /sci-chemistry/coot/files | |
| parent | Sip patch from bgo (diff) | |
| download | sci-dac6bba2f486cfde36b821d20439241680ee4ddb.tar.gz sci-dac6bba2f486cfde36b821d20439241680ee4ddb.tar.bz2 sci-dac6bba2f486cfde36b821d20439241680ee4ddb.zip | |
Real OPENMP fix
(Portage version: 2.2.0_alpha1/git/Linux x86_64, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'sci-chemistry/coot/files')
| -rw-r--r-- | sci-chemistry/coot/files/9999-include.patch | 12 | ||||
| -rw-r--r-- | sci-chemistry/coot/files/9999-openmp.patch | 52 |
2 files changed, 62 insertions, 2 deletions
diff --git a/sci-chemistry/coot/files/9999-include.patch b/sci-chemistry/coot/files/9999-include.patch new file mode 100644 index 000000000..3076663db --- /dev/null +++ b/sci-chemistry/coot/files/9999-include.patch @@ -0,0 +1,12 @@ +Index: lbg/Makefile.am +=================================================================== +--- lbg/Makefile.am (revision 3219) ++++ lbg/Makefile.am (working copy) +@@ -2,6 +2,7 @@ + lib_LTLIBRARIES=libcoot-lidia.la + + INCLUDES = \ ++ -I$(top_srcdir)/coot-utils \ + -I$(top_srcdir)/lidia-core \ + -I$(top_srcdir)/geometry \ + -I$(top_srcdir)/utils \ diff --git a/sci-chemistry/coot/files/9999-openmp.patch b/sci-chemistry/coot/files/9999-openmp.patch index 800ea38d9..03fc9a46b 100644 --- a/sci-chemistry/coot/files/9999-openmp.patch +++ b/sci-chemistry/coot/files/9999-openmp.patch @@ -1,13 +1,61 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 3219) ++++ configure.in (working copy) +@@ -51,6 +51,21 @@ + + AC_OPENMP + ++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) ++ ++ + AC_LIB_PREPARE_MULTILIB + + AC_SUBST(COOT_STDTYPES) Index: surface/Makefile.am =================================================================== ---- surface/Makefile.am (revision 3183) +--- surface/Makefile.am (revision 3219) +++ surface/Makefile.am (working copy) @@ -48,7 +48,7 @@ CXXUtils.h \ CXXSphereFlatTriangle.h -libccp4mg_surface_la_LIBADD = $(CLIPPER_LIBS) $(MMDB_LIBS) -+libccp4mg_surface_la_LIBADD = $(CLIPPER_LIBS) $(MMDB_LIBS) $(OPENMP_CFLAGS) ++libccp4mg_surface_la_LIBADD = $(CLIPPER_LIBS) $(MMDB_LIBS) $(GOMP_LIBS) # CXXAtom.h CXXAtom.cpp +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (revision 3219) ++++ src/Makefile.am (working copy) +@@ -166,7 +166,7 @@ + $(GUILE_CFLAGS) \ + $(PYTHON_CFLAGS) \ + $(COOT_WINDOWS_CFLAGS) \ +- $(COOT_GSL_FLAGS) $(OPENMP_CFLAGS) ++ $(COOT_GSL_FLAGS) $(OPENMP_CXXFLAGS) + + + +@@ -414,7 +414,7 @@ + # coot_real_LDFLAGS = -static -lstdc++ + coot_real_LDFLAGS = + +-coot_real_LDADD = $(OPENMP_CFLAGS) \ ++coot_real_LDADD = $(GOMP_LIBS) \ + $(COOT_EXTRA_LIBS) \ + $(GUILE_GTK_LIBS) \ + $(GUILE_LDFLAGS) \ |