openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File fix_build.patch of Package occt

--- CMakeLists.txt.orig	2017-08-30 15:27:56.000000000 +0200
+++ CMakeLists.txt	2017-09-01 11:35:42.325210630 +0200
@@ -1056,7 +1056,7 @@
 endforeach()
 # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
 install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+install (CODE "file(INSTALL FILES \"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" DESTINATION \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" TYPE FILE)")
 
 foreach (OCCT_MODULE ${OCCT_MODULES})
   if (BUILD_MODULE_${OCCT_MODULE})
--- src/Standard/Standard_CLocaleSentry.hxx.orig	2017-09-01 12:08:12.255680680 +0200
+++ src/Standard/Standard_CLocaleSentry.hxx	2017-09-01 12:08:25.279681204 +0200
@@ -35,11 +35,6 @@
   #endif
 #endif // ifndef HAVE_LOCALE_H
 
-#if defined(HAVE_XLOCALE_H) && !(defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 24))
-  // xlocale.h is actually a non-standard header file; glibc 2.26 has removed it altogether (all definition comes from locale.h)
-  #include <xlocale.h>
-#endif
-
 #if !defined(__ANDROID__)
 
 //! This class intended to temporary switch C locale and logically equivalent to setlocale(LC_ALL, "C").

Places

File fix_build.patch of Package occt

Places