On 2019/06/13 08:14, Rafael Sadowski wrote:
> On Wed Jun 12, 2019 at 10:08:15AM -0700, [email protected] wrote:
> > This explicity disables OpenMP for clementine and an included third-party
> > library.
> > 
> > 
> > Index: audio/clementine/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/clementine/Makefile,v
> > retrieving revision 1.35
> > diff -u -p -r1.35 Makefile
> > --- audio/clementine/Makefile       20 May 2019 22:15:01 -0000      1.35
> > +++ audio/clementine/Makefile       9 Jun 2019 01:03:35 -0000
> > @@ -71,6 +71,9 @@ CONFIGURE_ARGS =  -DENABLE_SOUNDMENU:Bool
> >  # It's advised by Google to use bundled GTest and GMock
> >  CONFIGURE_ARGS +=  -DFORCE_BUNDLED_GMOCK=Yes
> >  
> > +# No OpenMP until we can
> > +CONFIGURE_ARGS +=       -DUSE_OPENMP:Bool=No
> 
> Correct, because USE_OPENMP is not defined as an option. See:
> https://cmake.org/cmake/help/v3.0/command/option.html
> 
> I'm fine with the approach below but in opinion we need a REVSION bump
> because we change the build.

It doesn't hurt either way, and it seems safer. OK sthen with the bump.

> Currently we find the compiler option successfully,
> 
> -- Performing Test SUPPORTS_OPENMP
> -- Performing Test SUPPORTS_OPENMP - Success
> 
> and that sets -fopenmp to the compiler flags.
> 
> CC'ed maintainer
> 
> > +
> >  # Use system SQLite
> >  # XXX Currently not possible, because devel/sqlite3 is built without
> >  # -DSQLITE_ENABLE_FTS3_TOKENIZER.
> > Index: audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
> > ===================================================================
> > RCS file: 
> > /cvs/ports/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 patch-3rdparty_libprojectm_CMakeLists_txt
> > --- audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt      
> > 6 Feb 2013 13:23:03 -0000       1.1
> > +++ audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt      
> > 9 Jun 2019 01:03:35 -0000
> > @@ -1,6 +1,16 @@
> >  $OpenBSD: patch-3rdparty_libprojectm_CMakeLists_txt,v 1.1 2013/02/06 
> > 13:23:03 zhuk Exp $
> > ---- 3rdparty/libprojectm/CMakeLists.txt.orig       Wed Feb  6 16:10:58 2013
> > -+++ 3rdparty/libprojectm/CMakeLists.txt    Wed Feb  6 16:11:33 2013
> > +Index: 3rdparty/libprojectm/CMakeLists.txt
> > +--- 3rdparty/libprojectm/CMakeLists.txt.orig
> > ++++ 3rdparty/libprojectm/CMakeLists.txt
> > +@@ -17,7 +17,7 @@ set(USE_FBO ON)
> > + set(USE_FTGL OFF)
> > + set(USE_GLES1 OFF)
> > + set(USE_THREADS OFF)
> > +-set(USE_OPENMP ON)
> > ++set(USE_OPENMP OFF)
> > + set(USE_NATIVE_GLEW OFF)
> > + set(USE_CG OFF)
> > + set(BUILD_PROJECTM_STATIC ON)
> >  @@ -164,7 +164,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libproject
> >   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" 
> > "${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY)
> >   
> > 
> 

Reply via email to