File sort-lists.patch of Package llvm3_5

Overview Repositories Revisions Requests Users Attributes Meta

File sort-lists.patch of Package llvm3_5

diff -ruNp a/cmake/modules/Makefile b/cmake/modules/Makefile
--- a/cmake/modules/Makefile
+++ b/cmake/modules/Makefile
@@ -115,7 +115,7 @@ SKIPSRCMODS := \
   LLVMExports.cmake \
   VersionFromVCS.cmake
 
-SRCMODS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cmake))
+SRCMODS := $(sort $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cmake)))
 SRCMODS := $(filter-out $(SKIPSRCMODS),$(SRCMODS))
 INSTSRCMODS := $(addprefix $(PROJ_cmake)/, $(SRCMODS))
 INSTOBJMODS := $(addprefix $(PROJ_cmake)/, $(OBJMODS))
diff -ruNp a/docs/Makefile b/docs/Makefile
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -29,8 +29,8 @@ endif
 
 include $(LEVEL)/Makefile.common
 
-HTML       := $(wildcard $(PROJ_SRC_DIR)/*.html) \
-              $(wildcard $(PROJ_SRC_DIR)/*.css)
+HTML       := $(sort $(wildcard $(PROJ_SRC_DIR)/*.html)) \
+              $(sort $(wildcard $(PROJ_SRC_DIR)/*.css))
 DOXYFILES  := doxygen.cfg.in doxygen.css doxygen.footer doxygen.header \
               doxygen.intro
 EXTRA_DIST := $(HTML) $(DOXYFILES) llvm.css CommandGuide
diff -ruNp a/lib/IR/Makefile b/lib/IR/Makefile
--- a/lib/IR/Makefile
+++ b/lib/IR/Makefile
@@ -17,7 +17,7 @@ include $(LEVEL)/Makefile.common
 GENFILE:=$(PROJ_OBJ_ROOT)/include/llvm/IR/Intrinsics.gen
 
 INTRINSICTD  := $(PROJ_SRC_ROOT)/include/llvm/IR/Intrinsics.td
-INTRINSICTDS := $(wildcard $(PROJ_SRC_ROOT)/include/llvm/IR/Intrinsics*.td)
+INTRINSICTDS := $(sort $(wildcard $(PROJ_SRC_ROOT)/include/llvm/IR/Intrinsics*.td))
 
 $(ObjDir)/Intrinsics.gen.tmp: $(ObjDir)/.dir $(INTRINSICTDS) $(LLVM_TBLGEN)
 	$(Echo) Building Intrinsics.gen.tmp from Intrinsics.td
diff -ruNp a/Makefile.rules b/Makefile.rules
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -137,12 +137,12 @@ endif
 ################################################################################
 
 SrcMakefiles       := $(filter %Makefile %Makefile.tests,\
-                      $(wildcard $(PROJ_SRC_DIR)/Makefile*))
+                      $(sort $(wildcard $(PROJ_SRC_DIR)/Makefile*)))
 ObjMakefiles       := $(subst $(PROJ_SRC_DIR),$(PROJ_OBJ_DIR),$(SrcMakefiles))
 ConfigureScript    := $(PROJ_SRC_ROOT)/configure
 ConfigStatusScript := $(PROJ_OBJ_ROOT)/config.status
-MakefileConfigIn   := $(strip $(wildcard $(PROJ_SRC_ROOT)/Makefile.config.in))
-MakefileCommonIn   := $(strip $(wildcard $(PROJ_SRC_ROOT)/Makefile.common.in))
+MakefileConfigIn   := $(sort $(strip $(wildcard $(PROJ_SRC_ROOT)/Makefile.config.in)))
+MakefileCommonIn   := $(sort $(strip $(wildcard $(PROJ_SRC_ROOT)/Makefile.common.in)))
 MakefileConfig     := $(PROJ_OBJ_ROOT)/Makefile.config
 MakefileCommon     := $(PROJ_OBJ_ROOT)/Makefile.common
 PreConditions      := $(ConfigStatusScript) $(ObjMakefiles)
@@ -802,8 +802,8 @@ AliasTool     = ln -sf
 #----------------------------------------------------------
 
 ifndef SOURCES
-  Sources := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp \
-             $(PROJ_SRC_DIR)/*.cc $(PROJ_SRC_DIR)/*.c))
+  Sources := $(sort $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp \
+             $(PROJ_SRC_DIR)/*.cc $(PROJ_SRC_DIR)/*.c)))
 else
   Sources := $(SOURCES)
 endif
@@ -1634,13 +1634,13 @@ endif # TABLEGEN_INC_FILES_COMMON
 
 ifdef TARGET
 
-TDFiles := $(strip $(wildcard $(PROJ_SRC_DIR)/*.td) \
+TDFiles := $(sort $(strip $(wildcard $(PROJ_SRC_DIR)/*.td)) \
            $(LLVM_SRC_ROOT)/include/llvm/Target/Target.td \
            $(LLVM_SRC_ROOT)/include/llvm/Target/TargetCallingConv.td \
            $(LLVM_SRC_ROOT)/include/llvm/Target/TargetSchedule.td \
            $(LLVM_SRC_ROOT)/include/llvm/Target/TargetSelectionDAG.td \
            $(LLVM_SRC_ROOT)/include/llvm/CodeGen/ValueTypes.td) \
-           $(wildcard $(LLVM_SRC_ROOT)/include/llvm/IR/Intrinsics*.td)
+           $(sort $(wildcard $(LLVM_SRC_ROOT)/include/llvm/IR/Intrinsics*.td))
 
 # All .inc.tmp files depend on the .td files.
 $(INCTMPFiles) : $(TDFiles)
@@ -1850,12 +1850,12 @@ DistTarBZ2  := $(PROJ_OBJ_ROOT)/$(DistNa
 DistAlways  := CREDITS.TXT LICENSE.TXT README.txt README AUTHORS COPYING \
 	       ChangeLog INSTALL NEWS Makefile Makefile.common Makefile.rules \
 	       Makefile.config.in configure autoconf
-DistOther   := $(notdir $(wildcard \
+DistOther   := $(sort $(notdir $(wildcard \
                $(PROJ_SRC_DIR)/*.h \
                $(PROJ_SRC_DIR)/*.td \
                $(PROJ_SRC_DIR)/*.def \
                $(PROJ_SRC_DIR)/*.ll \
-               $(PROJ_SRC_DIR)/*.in))
+               $(PROJ_SRC_DIR)/*.in)))
 DistSubDirs := $(SubDirs)
 DistSources  = $(Sources) $(EXTRA_DIST)
 DistFiles    = $(DistAlways) $(DistSources) $(DistOther)
diff -ruNp a/projects/Makefile b/projects/Makefile
--- a/projects/Makefile
+++ b/projects/Makefile
@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.config
 
 # Compile all subdirs, except for the test suite, which lives in test-suite.
 # Before 2008.06.24 it lived in llvm-test, so exclude that as well for now.
-DIRS:= $(filter-out llvm-test test-suite,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile)))
+DIRS:= $(filter-out llvm-test test-suite,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(sort $(wildcard $(PROJ_SRC_DIR)/*/Makefile))))
 
 # Don't build compiler-rt, it isn't designed to be built directly.
 DIRS := $(filter-out compiler-rt,$(DIRS))
diff -ruNp a/tools/llvm-shlib/Makefile b/tools/llvm-shlib/Makefile
--- a/tools/llvm-shlib/Makefile
+++ b/tools/llvm-shlib/Makefile
@@ -33,8 +33,8 @@ include $(LEVEL)/Makefile.common
 
 # Include all archives in libLLVM.(so|dylib) except the ones that have
 # their own dynamic libraries and TableGen.
-Archives := $(wildcard $(LibDir)/libLLVM*.a)
-SharedLibraries := $(wildcard $(LibDir)/libLLVM*$(SHLIBEXT))
+Archives := $(sort $(wildcard $(LibDir)/libLLVM*.a))
+SharedLibraries := $(sort $(wildcard $(LibDir)/libLLVM*$(SHLIBEXT)))
 ExcludeFromLibLlvm := $(basename $(SharedLibraries)).a %/libLLVMTableGen.a
 IncludeInLibLlvm := $(filter-out $(ExcludeFromLibLlvm), $(Archives))
 LLVMLibsOptions := $(IncludeInLibLlvm:$(LibDir)/lib%.a=-l%)
diff -ruNp a/unittests/Makefile.unittest b/unittests/Makefile.unittest
--- a/unittests/Makefile.unittest
+++ b/unittests/Makefile.unittest
@@ -18,7 +18,7 @@ endif
 # Clean up out-of-tree stray unittests for Lit not to pick one up.
 .PHONY: cleanup-local
 cleanup-local:
-	-$(Verb) $(FIND) $(filter-out $(PARALLEL_DIRS), $(wildcard *)) -type f \
+	-$(Verb) $(FIND) $(filter-out $(PARALLEL_DIRS), $(sort $(wildcard *))) -type f \
 	  -path '*/$(BuildMode)/*Tests$(EXEEXT)' \
 	  -exec rm -f '{}' \;

Places

File sort-lists.patch of Package llvm3_5

Places