861ac185a6
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
40 lines
902 B
Diff
40 lines
902 B
Diff
--- a/include/abg-comparison.h
|
|
+++ b/include/abg-comparison.h
|
|
@@ -27,6 +27,7 @@
|
|
|
|
#include <ostream>
|
|
+#include <sys/types.h>
|
|
#include "abg-cxx-compat.h"
|
|
#include "abg-corpus.h"
|
|
#include "abg-diff-utils.h"
|
|
#include "abg-ini.h"
|
|
--- a/src/abg-dwarf-reader.cc
|
|
+++ b/src/abg-dwarf-reader.cc
|
|
@@ -37,6 +37,10 @@
|
|
#include <cmath>
|
|
#include <elfutils/libdwfl.h>
|
|
#include <dwarf.h>
|
|
+#include <elf.h>
|
|
+#ifndef EM_OPENRISC
|
|
+# define EM_OPENRISC 92
|
|
+#endif
|
|
#include <algorithm>
|
|
#include <iostream>
|
|
#include <tr1/unordered_map>
|
|
--- a/tools/abisym.cc
|
|
+++ b/tools/abisym.cc
|
|
@@ -151,10 +151,10 @@
|
|
cout << "could not find symbol '"
|
|
<< opts.symbol_name
|
|
<< "' in file '";
|
|
- if (opts.absolute_path)
|
|
+ //if (opts.absolute_path)
|
|
cout << opts.elf_path << "'\n";
|
|
- else
|
|
- cout << basename(opts.elf_path);
|
|
+ //else
|
|
+ //cout << basename(opts.elf_path);
|
|
return 0;
|
|
}
|
|
|