[Pkg-openmpi-commits] r382 - /openmpi/trunk/debian/patches/reproducible-build.patch
mckinstry at users.alioth.debian.org
mckinstry at users.alioth.debian.org
Mon May 23 13:09:22 UTC 2016
Author: mckinstry
Date: Mon May 23 13:09:21 2016
New Revision: 382
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=382
Log:
sort CMake globb'ed files for reproducibility
Modified:
openmpi/trunk/debian/patches/reproducible-build.patch
Modified: openmpi/trunk/debian/patches/reproducible-build.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/reproducible-build.patch?rev=382&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/reproducible-build.patch (original)
+++ openmpi/trunk/debian/patches/reproducible-build.patch Mon May 23 13:09:21 2016
@@ -1,12 +1,13 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Remove __DATE__ timestamps to make build bit-reproducible.
+ Also: Sort file lists that are globbed. See https://bugs.debian.org/824263
Forwarded: no
-Last-Updated: 2016-01-26
+Last-Updated: 2016-05-23
-Index: openmpi-1.10.2/ompi/debuggers/ompi_msgq_dll.c
+Index: openmpi/ompi/debuggers/ompi_msgq_dll.c
===================================================================
---- openmpi-1.10.2.orig/ompi/debuggers/ompi_msgq_dll.c
-+++ openmpi-1.10.2/ompi/debuggers/ompi_msgq_dll.c
+--- openmpi.orig/ompi/debuggers/ompi_msgq_dll.c
++++ openmpi/ompi/debuggers/ompi_msgq_dll.c
@@ -190,7 +190,7 @@ int mqs_version_compatibility (void)
char *mqs_version_string (void)
{
@@ -16,3 +17,115 @@
} /* mqs_version_string */
/* So the debugger can tell what interface width the library was compiled with */
+Index: openmpi/ompi/CMakeLists.txt
+===================================================================
+--- openmpi.orig/ompi/CMakeLists.txt
++++ openmpi/ompi/CMakeLists.txt
+@@ -32,6 +32,7 @@ FOREACH(OMPI_SUBDIR ${OMPI_SUBDIRS})
+
+ FILE(GLOB_RECURSE OMPI_${OMPI_SUBDIR}_FILES
+ "${OMPI_SUBDIR}/*.h" "${OMPI_SUBDIR}/*.c" "${OMPI_SUBDIR}/*.cc" "${OMPI_SUBDIR}/*.cpp")
++ LIST(SORT OMPI_${OMPI_SUBDIR}_FILES)
+
+ SET (OMPI_SOURCE_FILES
+ ${OMPI_SOURCE_FILES}
+@@ -47,6 +48,7 @@ ENDFOREACH(OMPI_SUBDIR ${OMPI_SUBDIRS})
+
+ # Add MPI C files
+ FILE(GLOB OMPI_MPI_C_FILES "mpi/c/*.h" "mpi/c/*.c")
++LIST(SORT OMPI_MPI_C_FILES)
+
+ # Remove all MPI_File related files if the option is not selected
+ IF (NOT OMPI_PROVIDE_MPI_FILE_INTERFACE)
+@@ -99,6 +101,7 @@ IF(OMPI_WANT_FORTRAN_BINDINGS)
+ # A handful of files in mpi/fortran/base must be included in libmpi, in order to build the
+ # Fortran 77 glue into libmpi
+ FILE(GLOB OMPI_FORTRAN_BASE_FILES "mpi/fortran/base/*.c")
++ LIST(SORT OMPI_FORTRAN_BASE_FILES)
+ SET_SOURCE_FILES_PROPERTIES(${OMPI_FORTRAN_BASE_FILES}
+ PROPERTIES COMPILE_FLAGS "${OMPI_C_DEF_PRE}OMPI_COMPILING_FORTRAN_WRAPPERS=1 ${OMPI_C_DEF_PRE}OMPI_PROFILE_LAYER=0")
+ SET(OMPI_SOURCE_FILES ${OMPI_SOURCE_FILES} ${OMPI_FORTRAN_BASE_FILES})
+Index: openmpi/ompi/mpi/cxx/CMakeLists.txt
+===================================================================
+--- openmpi.orig/ompi/mpi/cxx/CMakeLists.txt
++++ openmpi/ompi/mpi/cxx/CMakeLists.txt
+@@ -8,6 +8,7 @@
+ #
+
+ FILE(GLOB CXX_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
++list(SORT CXX_SOURCE_FILES)
+
+ # skip the file interface sources if not wanted
+ IF(NOT OMPI_PROVIDE_MPI_FILE_INTERFACE)
+Index: openmpi/ompi/tools/ompi_info/CMakeLists.txt
+===================================================================
+--- openmpi.orig/ompi/tools/ompi_info/CMakeLists.txt
++++ openmpi/ompi/tools/ompi_info/CMakeLists.txt
+@@ -8,6 +8,7 @@
+ #
+
+ FILE(GLOB_RECURSE OMPI_INFO_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
++LIST(SORT OMPI_INFO_SOURCE_FILES)
+ ADD_EXECUTABLE (ompi_info ${OMPI_INFO_SOURCE_FILES})
+
+ ADD_DEPENDENCIES(ompi_info libmpi)
+Index: openmpi/opal/CMakeLists.txt
+===================================================================
+--- openmpi.orig/opal/CMakeLists.txt
++++ openmpi/opal/CMakeLists.txt
+@@ -35,6 +35,7 @@ ENDIF(OPAL_WANT_LIBLTDL)
+
+ # Include headers.
+ FILE(GLOB OPAL_INCLUDE_FILES "include/*.h" "include/opal/*.h" "include/opal/sys/win32/*.h")
++LIST(SORT OPAL_INCLUDE_FILES)
+ SOURCE_GROUP(include FILES ${OPAL_INCLUDE_FILES})
+
+ SET (OPAL_SOURCE_FILES
+@@ -56,9 +57,9 @@ FOREACH(OPAL_SUBDIR ${OPAL_SUBDIRS})
+
+ IF(${OPAL_EXCLUDE_SUBDIR} EQUAL -1)
+
+- FILE(GLOB_RECURSE OPAL_${OPAL_SUBDIR}_FILES
++ FILE(GLOB_RECURSE OPAL_${OPAL_SUBDIR}_FILES
+ "${OPAL_SUBDIR}/*.h" "${OPAL_SUBDIR}/*.c" "${OPAL_SUBDIR}/*.cc" "${OPAL_SUBDIR}/*.cpp")
+-
++ LIST(SORT OPAL_${OPAL_SUBDIR}_FILES)
+ SET (OPAL_SOURCE_FILES
+ ${OPAL_SOURCE_FILES}
+ ${OPAL_${OPAL_SUBDIR}_FILES}
+Index: openmpi/opal/tools/opal-checkpoint/CMakeLists.txt
+===================================================================
+--- openmpi.orig/opal/tools/opal-checkpoint/CMakeLists.txt
++++ openmpi/opal/tools/opal-checkpoint/CMakeLists.txt
+@@ -8,6 +8,7 @@
+ #
+
+ FILE(GLOB_RECURSE OPAL_CHECKPOINT_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
++LIST(SORT OPAL_CHECKPOINT_SOURCE_FILES)
+
+ ADD_EXECUTABLE (opal-checkpoint ${OPAL_CHECKPOINT_SOURCE_FILES})
+
+Index: openmpi/opal/tools/opal-restart/CMakeLists.txt
+===================================================================
+--- openmpi.orig/opal/tools/opal-restart/CMakeLists.txt
++++ openmpi/opal/tools/opal-restart/CMakeLists.txt
+@@ -8,6 +8,7 @@
+ #
+
+ FILE(GLOB_RECURSE OPAL_RESTART_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
++LIST(SORT OPAL_RESTART_SOURCE_FILES)
+
+ ADD_EXECUTABLE (opal-restart ${OPAL_RESTART_SOURCE_FILES})
+
+Index: openmpi/opal/tools/wrappers/CMakeLists.txt
+===================================================================
+--- openmpi.orig/opal/tools/wrappers/CMakeLists.txt
++++ openmpi/opal/tools/wrappers/CMakeLists.txt
+@@ -8,6 +8,7 @@
+ #
+
+ FILE(GLOB_RECURSE OPAL_WRAPPER_SOURCE_FILES "*.h" "*.c" "*.cc" "*.cpp")
++LIST(SORT OPAL_WRAPPER_SOURCE_FILES)
+
+ ADD_EXECUTABLE (opal-wrapper ${OPAL_WRAPPER_SOURCE_FILES})
+
More information about the Pkg-openmpi-commits
mailing list