Secure libomp copying / erasing for macos ci jobs (avoiding losing macports...

Secure libomp copying / erasing for macos ci jobs (avoiding losing macports version as it happenned sometimes).

.gitlab-ci.yml

@@ -86,13 +86,13 @@ pkg_macos:
         - 'cmake -DOpenMP_gomp_LIBRARY=/opt/local/lib/libomp/libgomp.dylib -DBUILD_WRAPPER_PYTHON=ON -DBUILD_DOCUMENTATION=ON -DCPACK_PACKAGE_VERSION=$SHA_START -DCMAKE_INSTALL_PREFIX=/opt/local/faust-$SHA_START -DBUILD_TESTING=OFF -DREMOTE_DATA_URL="$DURL" -DREMOTE_DATA_FILE="$DFILE" -DEXPERIMENTAL_PKG=ON -DBUILD_MULTITHREAD=ON -DNOPY2=ON -DCMAKE_CXX_COMPILER=/opt/local/bin/clang++-mp-8.0 -DBUILD_FLOAT_PYX=ON ..'
         - make LANG=en_GB.UTF-8
         # to compile matlab wrappers use matlab libiomp5 but backup the clang lib first
-        - sudo mv /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libomp.dylib.bak
-        - sudo cp /opt/local/lib/libomp/libiomp5.dylib /opt/local/lib/libomp/libomp.dylib
+        #- sudo mv /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libomp.dylib.bak
+        - sudo cp /opt/local/lib/libomp/libiomp5_matlab.dylib /opt/local/lib/libomp/libomp.dylib
         - cmake -DBUILD_WRAPPER_MATLAB=ON ..
         - make LANG=en_GB.UTF-8
         # restore clang libomp
-        - sudo cp /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libiomp5.dylib
-        - sudo mv /opt/local/lib/libomp/libomp.dylib.bak /opt/local/lib/libomp/libomp.dylib
+        #- sudo cp /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libiomp5.dylib
+        - sudo cp /opt/local/lib/libomp/libomp_macports.dylib /opt/local/lib/libomp/libomp.dylib
         # ensure the linking of libomp to the python wrapper shared lib is right (not overridden by matlab libomp)
         - sudo install_name_tool -change @rpath/libiomp5.dylib /opt/local/lib/libomp/libomp.dylib wrapper/python/_FaustCorePy.cpython-*-darwin.so
         - sudo make install LANG=en_GB.UTF-8
@@ -228,13 +228,13 @@ pkg_macos_release:
         - 'cmake -DOpenMP_gomp_LIBRARY=/opt/local/lib/libomp/libgomp.dylib -DBUILD_WRAPPER_PYTHON=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=/opt/local/faust -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG -DCMAKE_BUILD_TYPE=Release -DEXCLUDE_FAUST_LIB_INSTALL=ON -DBUILD_TESTING=OFF -DREMOTE_DATA_URL="$DURL" -DREMOTE_DATA_FILE="$DFILE" -DBUILD_MULTITHREAD=ON -DNOPY2=ON -DCMAKE_CXX_COMPILER=/opt/local/bin/clang++-mp-8.0 -DBUILD_FLOAT_PYX=ON ..'
         - make LANG=en_GB.UTF-8
         # to compile matlab wrappers use matlab libiomp5 but backup the clang lib first
-        - sudo mv /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libomp.dylib.bak
-        - sudo cp /opt/local/lib/libomp/libiomp5.dylib /opt/local/lib/libomp/libomp.dylib
+        #- sudo mv /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libomp.dylib.bak
+        - sudo cp /opt/local/lib/libomp/libiomp5_matlab.dylib /opt/local/lib/libomp/libomp.dylib
         - cmake -DBUILD_WRAPPER_MATLAB=ON ..
         - make LANG=en_GB.UTF-8
         # restore clang libomp
-        - sudo cp /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libiomp5.dylib
-        - sudo mv /opt/local/lib/libomp/libomp.dylib.bak /opt/local/lib/libomp/libomp.dylib
+        #- sudo cp /opt/local/lib/libomp/libomp.dylib /opt/local/lib/libomp/libiomp5.dylib
+        - sudo cp /opt/local/lib/libomp/libomp_macports.dylib /opt/local/lib/libomp/libomp.dylib
           # ensure the linking of libomp to the python wrapper shared lib is right (not overridden by matlab libomp)
         - otool -L wrapper/python/_FaustCorePy.cpython-*-darwin.so
         - sudo install_name_tool -change @rpath/libiomp5.dylib /opt/local/lib/libomp/libomp.dylib wrapper/python/_FaustCorePy.cpython-*-darwin.so