[packages/xdmf] - added format patch (fixes build with -Werror=format-security) - added lib patch (fixes lib64 build

qboosh qboosh at pld-linux.org
Sat Sep 14 09:47:35 CEST 2013


commit 1991adfc4d1f112f660b762f2568e7e312991168
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 14 09:47:23 2013 +0200

    - added format patch (fixes build with -Werror=format-security)
    - added lib patch (fixes lib64 build)

 xdmf-format.patch |  20 +++++++
 xdmf-lib.patch    | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xdmf.spec         |   4 ++
 3 files changed, 183 insertions(+)
---
diff --git a/xdmf.spec b/xdmf.spec
index dc5fc92..00e2257 100644
--- a/xdmf.spec
+++ b/xdmf.spec
@@ -25,6 +25,8 @@ Patch0:		%{name}-include.patch
 Patch1:		%{name}-soname.patch
 Patch2:		%{name}-log2.patch
 Patch3:		%{name}-destdir.patch
+Patch4:		%{name}-format.patch
+Patch5:		%{name}-lib.patch
 URL:		http://www.xdmf.org/
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake >= 2.4
@@ -79,6 +81,8 @@ Pythonowy interfejs do biblioteki Xdmf.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 mkdir build
diff --git a/xdmf-format.patch b/xdmf-format.patch
new file mode 100644
index 0000000..edd41ec
--- /dev/null
+++ b/xdmf-format.patch
@@ -0,0 +1,20 @@
+--- Xdmf/Utilities/metis/util.c.orig	2013-09-13 21:24:12.598895465 +0200
++++ Xdmf/Utilities/metis/util.c	2013-09-14 07:03:03.775021464 +0200
+@@ -20,15 +20,14 @@
+ void errexit(char *f_str,...)
+ {
+   va_list argp;
+-  char out1[256], out2[256];
++  char out1[256];
+ 
+   va_start(argp, f_str);
+   vsprintf(out1, f_str, argp);
+   va_end(argp);
+ 
+-  sprintf(out2, "Error! %s", out1);
++  fprintf(stdout, "Error! %s", out1);
+ 
+-  fprintf(stdout, out2);
+   fflush(stdout);
+ 
+   abort();
diff --git a/xdmf-lib.patch b/xdmf-lib.patch
new file mode 100644
index 0000000..ed5c022
--- /dev/null
+++ b/xdmf-lib.patch
@@ -0,0 +1,159 @@
+--- Xdmf/CMakeLists.txt.orig	2010-04-05 21:24:41.000000000 +0200
++++ Xdmf/CMakeLists.txt	2013-09-14 07:26:23.036584397 +0200
+@@ -41,7 +41,7 @@
+ INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
+ INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
+ 
+-SET(VTK_INSTALL_LIB_DIR "/lib")
++SET(VTK_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}")
+ 
+ OPTION(XDMF_MEMORY_DEBUG "Enable Memory Debugging in Xdmf" OFF)
+ IF(XDMF_MEMORY_DEBUG)
+@@ -63,7 +63,7 @@
+     SET(XDMF_METIS_INCLUDE_DIR_CONFIG ${METIS_INCLUDE_DIRS})
+     SET(XDMF_METIS_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/metis)
+     SET(XDMF_METIS_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
+-    SET(XDMF_METIS_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
++    SET(XDMF_METIS_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ ENDIF(XDMF_BUILD_UTILS)
+ 
+ #############################################################################
+@@ -130,7 +130,7 @@
+     SET(XDMF_ZLIB_INCLUDE_DIR_CONFIG ${HDF5_ZLIB_INCLUDE_DIRS})
+     SET(XDMF_ZLIB_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtkzlib)
+     SET(XDMF_ZLIB_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
+-    SET(XDMF_ZLIB_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
++    SET(XDMF_ZLIB_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+     SET(XDMF_ZLIB_LIBRARIES vtkzlib)
+ 
+   ENDIF(XDMF_SYSTEM_ZLIB)
+@@ -166,7 +166,7 @@
+     SET(XDMF_NETCDF_INCLUDE_DIR_CONFIG ${NETCDF_INCLUDE_DIRS})
+     SET(XDMF_NETCDF_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtknetcdf)
+     SET(XDMF_NETCDF_LIBRARY_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/bin)
+-    SET(XDMF_NETCDF_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
++    SET(XDMF_NETCDF_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+   
+   ENDIF(XDMF_BUILD_VTK AND EXISTS ${VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}/vtk_netcdf.h)
+ 
+@@ -203,7 +203,7 @@
+     SET(XDMF_EXODUSII_INCLUDE_DIR_CONFIG ${EXODUSII_INCLUDE_DIRS})
+     SET(XDMF_EXODUSII_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtkexodus2)
+     SET(XDMF_EXODUSII_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
+-    SET(XDMF_EXODUSII_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
++    SET(XDMF_EXODUSII_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+  
+   ENDIF(XDMF_BUILD_VTK AND EXISTS ${VTK_INSTALL_PREFIX}${VTK_INSTALL_INCLUDE_DIR}/vtkexodus2/exodusII.h)
+ 
+@@ -242,7 +242,7 @@
+     SET(XDMF_LIBXML2_INCLUDE_DIR_CONFIG ${XDMF_LIBXML2_INCLUDE_DIRS})
+     SET(XDMF_LIBXML2_INCLUDE_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtklibxml2)
+     SET(XDMF_LIBXML2_LIBRARY_DIR_CONFIG ${Xdmf_BINARY_DIR}/bin)
+-    SET(XDMF_LIBXML2_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
++    SET(XDMF_LIBXML2_LIBRARY_DIR_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+     SET(XDMF_LIBXML2_LIBRARIES ${LIBXML2_LIBRARY})
+ 
+   ELSE(NOT XDMF_SYSTEM_LIBXML2)
+@@ -344,7 +344,7 @@
+   SET(XDMF_HDF5_INCLUDE_CONFIG ${Xdmf_SOURCE_DIR}/Utilities/hdf5 ${Xdmf_BINARY_DIR}/Utilities/hdf5 ${Xdmf_SOURCE_DIR}/Utilities)
+   SET(XDMF_HDF5_INCLUDE_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtkhdf5)
+   SET(XDMF_HDF5_LIBRARY_PATH_CONFIG ${Xdmf_BINARY_DIR}/bin)
+-  SET(XDMF_HDF5_LIBRARY_PATH_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib)
++  SET(XDMF_HDF5_LIBRARY_PATH_INSTALL_CONFIG ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+   SET(XDMF_HDF5_LIBRARIES ${HDF5_LIBRARY})
+ 
+ ENDIF(XDMF_SYSTEM_HDF5)
+@@ -417,7 +417,7 @@
+   SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+ 
+   # the RPATH to be used when installing
+-  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ 
+   # add the automatically determined parts of the RPATH
+   # which point to directories outside the build tree to the install RPATH
+@@ -473,7 +473,7 @@
+   ${Xdmf_BINARY_DIR}/XDMFConfig.cmake @ONLY IMMEDIATE)
+ 
+ SET(XDMF_INSTALL_BIN_DIR "/bin")
+-SET(XDMF_INSTALL_LIB_DIR "/lib")
++SET(XDMF_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}")
+ SET(XDMF_INSTALL_INCLUDE_DIR "/include")
+ SET(XDMF_INSTALL_INCLUDE_VTK_DIR "/include")
+ 
+@@ -513,11 +513,11 @@
+      SET(XDMF_INCLUDE_DIRS_CONFIG ${XDMF_INCLUDE_DIRS_CONFIG} ${DOLLAR}{XDMF_INSTALL_DIR}/include/utils)
+    ENDIF(XDMF_BUILD_UTILS)
+    SET(XDMF_LIBRARY_DIRS_CONFIG 
+-     ${DOLLAR}{XDMF_INSTALL_DIR}/lib
++     ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}
+      )
+-   SET(XDMF_USE_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib/XdmfCMake/UseXDMF.cmake)
+-   SET(XDMF_BUILD_SETTINGS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib/XdmfCMake/XDMFBuildSettings.cmake)
+-   SET(XDMF_LIBRARY_DEPENDS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib/XdmfCMake/XDMFLibraryDepends.cmake)
++   SET(XDMF_USE_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}/XdmfCMake/UseXDMF.cmake)
++   SET(XDMF_BUILD_SETTINGS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}/XdmfCMake/XDMFBuildSettings.cmake)
++   SET(XDMF_LIBRARY_DEPENDS_FILE ${DOLLAR}{XDMF_INSTALL_DIR}/lib${LIB_SUFFIX}/XdmfCMake/XDMFLibraryDepends.cmake)
+    SET(XDMF_KITS_DIR ${DOLLAR}{XDMF_INSTALL_DIR}/vtk)
+    CONFIGURE_FILE(${Xdmf_SOURCE_DIR}/XDMFConfig.cmake.in
+        ${Xdmf_BINARY_DIR}/XDMFConfigInstall.cmake @ONLY IMMEDIATE)
+--- Xdmf/Utilities/CMakeLists.txt.orig	2009-01-22 22:47:53.000000000 +0100
++++ Xdmf/Utilities/CMakeLists.txt	2013-09-14 07:38:48.141127926 +0200
+@@ -1,9 +1,9 @@
+ # SET(VTKHDF5_INSTALL_LIB_DIR /lib/Xdmf)
+-SET(VTKHDF5_INSTALL_LIB_DIR /lib)
++SET(VTKHDF5_INSTALL_LIB_DIR /lib${LIB_SUFFIX})
+ SUBDIRS(hdf5)
+ 
+ IF(XDMF_BUILD_VTK)
+   SUBDIRS(Doxygen)
+ ENDIF(XDMF_BUILD_VTK)
+ 
+-SET(VTK_INSTALL_LIB_DIR "/lib")
++SET(VTK_INSTALL_LIB_DIR "/lib${LIB_SUFFIX}")
+--- Xdmf/Utilities/metis/CMakeLists.txt.orig	2010-03-24 21:03:47.000000000 +0100
++++ Xdmf/Utilities/metis/CMakeLists.txt	2013-09-14 07:39:44.270398581 +0200
+@@ -59,7 +59,7 @@
+   SET(VTK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
+ ENDIF(NOT VTK_INSTALL_BIN_DIR_CM24)
+ IF(NOT VTK_INSTALL_LIB_DIR_CM24)
+-  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
++  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ ENDIF(NOT VTK_INSTALL_LIB_DIR_CM24)
+ IF(NOT VTK_INSTALL_INCLUDE_DIR_CM24)
+   SET(VTK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
+--- Xdmf/Utilities/vtkexodus2/CMakeLists.txt.orig	2010-01-06 17:33:02.000000000 +0100
++++ Xdmf/Utilities/vtkexodus2/CMakeLists.txt	2013-09-14 07:40:28.665791674 +0200
+@@ -209,7 +209,7 @@
+   SET(VTK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
+ ENDIF(NOT VTK_INSTALL_BIN_DIR_CM24)
+ IF(NOT VTK_INSTALL_LIB_DIR_CM24)
+-  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
++  SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ ENDIF(NOT VTK_INSTALL_LIB_DIR_CM24)
+ IF(NOT VTK_INSTALL_INCLUDE_DIR_CM24)
+   SET(VTK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
+--- Xdmf/Utilities/vtknetcdf/CMakeLists.txt.orig	2010-01-06 17:34:04.000000000 +0100
++++ Xdmf/Utilities/vtknetcdf/CMakeLists.txt	2013-09-14 07:41:28.941921726 +0200
+@@ -264,7 +264,7 @@
+     SET(VTK_INSTALL_BIN_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/bin)
+   ENDIF(NOT VTK_INSTALL_BIN_DIR_CM24)
+   IF(NOT VTK_INSTALL_LIB_DIR_CM24)
+-    SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib)
++    SET(VTK_INSTALL_LIB_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+   ENDIF(NOT VTK_INSTALL_LIB_DIR_CM24)
+   IF(NOT VTK_INSTALL_INCLUDE_DIR_CM24)
+     SET(VTK_INSTALL_INCLUDE_DIR_CM24 ${CMAKE_INSTALL_PREFIX}/include)
+--- Xdmf/CMake/setup_install_paths.py.orig	2010-01-06 17:32:58.000000000 +0100
++++ Xdmf/CMake/setup_install_paths.py	2013-09-14 09:27:23.336736013 +0200
+@@ -86,8 +86,8 @@
+         data    = home
+     elif os.name == 'posix':
+         ver = sys.version[0:3]
+-        purelib = prefix+'/lib/python'+ver+'/site-packages'
+-        platlib = exec_prefix+'/lib/python'+ver+'/site-packages'
++        purelib = prefix+'/' + sys.lib + '/python'+ver+'/site-packages'
++        platlib = exec_prefix+'/' + sys.lib + '/python'+ver+'/site-packages'
+         scripts = prefix+'/bin'
+         data    = prefix
+     elif sys.version < '2.2':
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xdmf.git/commitdiff/1991adfc4d1f112f660b762f2568e7e312991168



More information about the pld-cvs-commit mailing list