summaryrefslogtreecommitdiff
path: root/packages/patcher/files/freebsd_gpatch.patch
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2005-07-17 12:38:14 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-17 12:38:14 +0000
commit440d78ee0713d56b60320ac0bd9a4b38a42739dd (patch)
tree3a8b99fd4726e7a0ffa3f628993a37b057155f44 /packages/patcher/files/freebsd_gpatch.patch
parent93120a45883d73a32d67f004af3cf52d38f983e3 (diff)
patcher on FreeBSD:
-Patch patcher to use gpatch on FreeBSD
Diffstat (limited to 'packages/patcher/files/freebsd_gpatch.patch')
-rw-r--r--packages/patcher/files/freebsd_gpatch.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/packages/patcher/files/freebsd_gpatch.patch b/packages/patcher/files/freebsd_gpatch.patch
new file mode 100644
index 0000000000..f7e107a410
--- /dev/null
+++ b/packages/patcher/files/freebsd_gpatch.patch
@@ -0,0 +1,28 @@
+On FreeBSD the default patch program has a different command line
+interface than GNU patch. Make patcher use the GNU patch.
+
+
+--- patcher.py.old Mon Sep 13 21:59:05 2004
++++ patcher.py Sun Jul 17 14:24:50 2005
+@@ -631,8 +631,8 @@
+ my $res;
+
+ # ... then we look if the patch would apply cleanly ...
+- print "DEBUG: patch --dry-run $opt\n" if $debug > 1;
+- $res = system("patch --dry-run $opt >$patchlog 2>/dev/null");
++ print "DEBUG: gpatch --dry-run $opt\n" if $debug > 1;
++ $res = system("gpatch --dry-run $opt >$patchlog 2>/dev/null");
+ if ($res != 0) {
+ unless ($do_force) {
+ unlink($patchlog);
+@@ -669,8 +669,8 @@
+ # Finally we apply the patch. No need to create backup copies with -b,
+ # that has been done by PutIntoPatch()
+ $opt = "-f $opt" if $do_force;
+- print "DEBUG: patch $opt\n" if $debug > 1;
+- $res = system("patch $opt >$patchlog");
++ print "DEBUG: gpatch $opt\n" if $debug > 1;
++ $res = system("gpatch $opt >$patchlog");
+ unlink($patchlog);
+ $res = 0 if $do_force && $res == 256;
+ if ($res != 0) {