File xen.cmake-GLOB.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File xen.cmake-GLOB.patch of Package xen

From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 6 Jun 2018 17:49:47 +0200
Subject: cmake GLOB

stubdom/vtpm: sort entries returned by cmakes GLOB

file(GLOB) uses readdir, which provides files in an unpredictable order.
Sort the result before usage to get a reproducible result.
Newer cmake versions do that sorting automatically already.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 stubdom/Makefile                   |  1 +
 stubdom/vtpm-cmake_glob_sort.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 stubdom/vtpm-cmake_glob_sort.patch

--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -207,24 +207,25 @@ tpm_emulator-$(TPMEMU_VERSION).tar.gz:
 tpm_emulator-$(XEN_TARGET_ARCH): tpm_emulator-$(TPMEMU_VERSION).tar.gz
 	@if [ ! -f "$(CMAKE)" ]; then echo "cmake not installed! Install it and then rerun ./configure!"; false; fi
 	tar xzf $<
 	mv tpm_emulator-$(TPMEMU_VERSION) $@
 	patch -d $@ -p1 < tpmemu-$(TPMEMU_VERSION).patch;
 	patch -d $@ -p1 < vtpm-bufsize.patch
 	patch -d $@ -p1 < vtpm-locality.patch
 	patch -d $@ -p1 < vtpm-parent-sign-ek.patch
 	patch -d $@ -p1 < vtpm-deepquote.patch
 	patch -d $@ -p1 < vtpm-cmake-Wextra.patch
 	patch -d $@ -p1 < vtpm-implicit-fallthrough.patch
 	patch -d $@ -p1 < vtpm_extern.patch
+	patch -d $@ -p1 < vtpm-cmake_glob_sort.patch
 	mkdir $@/build
 	cd $@/build; CC=${CC} $(CMAKE) .. -DCMAKE_C_FLAGS:STRING="-std=c99 -DTPM_NO_EXTERN $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-declaration-after-statement"
 	touch $@
 
 TPMEMU_STAMPFILE=$(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libtpm.a
 $(TPMEMU_STAMPFILE): tpm_emulator-$(XEN_TARGET_ARCH) $(GMP_STAMPFILE)
 	( cd $</build && make VERBOSE=1 tpm_crypto tpm  )
 	cp $</build/crypto/libtpm_crypto.a $(CROSS_ROOT)/$(GNU_TARGET_ARCH)-xen-elf/lib/libtpm_crypto.a
 	cp $</build/tpm/libtpm.a $(TPMEMU_STAMPFILE)
 
 .PHONY: cross-tpmemu
 cross-tpmemu: $(TPMEMU_STAMPFILE)
new file mode 100644
--- /dev/null
+++ b/stubdom/vtpm-cmake_glob_sort.patch
@@ -0,0 +1,61 @@
+sort entries returned by readdir
+--- a/crypto/CMakeLists.txt
++++ b/crypto/CMakeLists.txt
+@@ -4,7 +4,9 @@
+ # $Id: CMakeLists.txt 464 2011-07-09 14:57:41Z mast $
+ 
+ file(GLOB tpm_crypto_SRCS "*.[h|c]")
++list(SORT tpm_crypto_SRCS)
+ file(GLOB bn_SRCS "bn_*.c")
++list(SORT bn_SRCS)
+ list(REMOVE_ITEM tpm_crypto_SRCS ${bn_SRCS})
+ 
+ if(USE_OPENSSL)
+--- a/mtm/CMakeLists.txt
++++ b/mtm/CMakeLists.txt
+@@ -6,5 +6,6 @@
+ add_definitions(-DMTM_EMULATOR)
+ file(GLOB tpm_SRCS ../tpm/tpm_cmd_handler.c ../tpm/tpm_data.c)
+ file(GLOB mtm_SRCS "*.[h|c]")
++list(SORT mtm_SRCS)
+ add_library(mtm STATIC ${mtm_SRCS} ${tpm_SRCS})
+ 
+--- a/tpm/CMakeLists.txt
++++ b/tpm/CMakeLists.txt
+@@ -4,5 +4,6 @@
+ # $Id: CMakeLists.txt 364 2010-02-11 10:24:45Z mast $
+ 
+ file(GLOB tpm_SRCS "*.[h|c]")
++list(SORT tpm_SRCS)
+ add_library(tpm STATIC ${tpm_SRCS})
+ 
+--- a/tpmd/unix/CMakeLists.txt
++++ b/tpmd/unix/CMakeLists.txt
+@@ -6,6 +6,7 @@
+ include_directories("${PROJECT_SOURCE_DIR}/tpm")
+ 
+ file(GLOB tpmd_SRCS "*.[h|c]")
++list(SORT tpmd_SRCS)
+ add_executable(tpmd ${tpmd_SRCS})
+ if(MTM_EMULATOR)
+ add_definitions(-DMTM_EMULATOR)
+--- a/tpmd/windows/CMakeLists.txt
++++ b/tpmd/windows/CMakeLists.txt
+@@ -6,6 +6,7 @@
+ include_directories("${PROJECT_SOURCE_DIR}/tpm")
+ 
+ file(GLOB tpmd_SRCS "*.[h|c]")
++list(SORT tpmd_SRCS)
+ add_executable(tpmd ${tpmd_SRCS})
+ if(MTM_EMULATOR)
+ add_definitions(-DMTM_EMULATOR)
+--- a/tpmd_dev/CMakeLists.txt
++++ b/tpmd_dev/CMakeLists.txt
+@@ -34,6 +34,7 @@ endif()
+ if(tpmd_dev_OBJ)
+ 
+ file(GLOB tpmd_dev_SRCS "${tpmd_dev_SOURCE_DIR}/*")
++list(SORT tpmd_dev_SRCS)
+ 
+ add_custom_command(OUTPUT ${tpmd_dev_OBJ}
+                    COMMAND cp -rf ${tpmd_dev_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}

Places

File xen.cmake-GLOB.patch of Package xen

Places