[Lldb-commits] [PATCH] D38328: Assume git-generated patch files in build scripts

[Francis Ricci via Phabricator via lldb-commits]

fjricci created this revision.

It is probably reasonable to expect that most (or all) users of
the patch file feature will be using git, and assuming
git patch files makes this feature easier to use.


https://reviews.llvm.org/D38328

Files:
  scripts/Xcode/build-llvm.py
  scripts/build-lldb-llvm-clang


Index: scripts/build-lldb-llvm-clang
===================================================================
--- scripts/build-lldb-llvm-clang
+++ scripts/build-lldb-llvm-clang
@@ -33,15 +33,15 @@
 for patch_file in ../scripts/llvm.*.diff
 do
        echo "Applying patch from '$patch_file'"
-    patch -p0 < "$patch_file"
+    patch -p1 < "$patch_file"
 done
 
 # change directory to "./llvm/tools/clang"
 cd tools/clang
 for patch_file in ../../../scripts/clang.*.diff
 do
        echo "Applying patch from '$patch_file'"
-    patch -p0 < "$patch_file"
+    patch -p1 < "$patch_file"
 done
 
 # change directory to "./"
Index: scripts/Xcode/build-llvm.py
===================================================================
--- scripts/Xcode/build-llvm.py
+++ scripts/Xcode/build-llvm.py
@@ -224,7 +224,7 @@
             f, spec['name'] + '.*.diff')]
     for p in patches:
         run_in_directory(["patch",
-                          "-p0",
+                          "-p1",
                           "-i",
                           os.path.join(lldb_source_path(),
                                        'scripts',



Index: scripts/build-lldb-llvm-clang
===================================================================
--- scripts/build-lldb-llvm-clang
+++ scripts/build-lldb-llvm-clang
@@ -33,15 +33,15 @@
 for patch_file in ../scripts/llvm.*.diff
 do
 	echo "Applying patch from '$patch_file'"
-    patch -p0 < "$patch_file"
+    patch -p1 < "$patch_file"
 done
 
 # change directory to "./llvm/tools/clang"
 cd tools/clang
 for patch_file in ../../../scripts/clang.*.diff
 do
 	echo "Applying patch from '$patch_file'"
-    patch -p0 < "$patch_file"
+    patch -p1 < "$patch_file"
 done
 
 # change directory to "./"
Index: scripts/Xcode/build-llvm.py
===================================================================
--- scripts/Xcode/build-llvm.py
+++ scripts/Xcode/build-llvm.py
@@ -224,7 +224,7 @@
             f, spec['name'] + '.*.diff')]
     for p in patches:
         run_in_directory(["patch",
-                          "-p0",
+                          "-p1",
                           "-i",
                           os.path.join(lldb_source_path(),
                                        'scripts',

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits