2fd8d4df94
```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
```
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
diff -ru a/include/complib/cl_debug_osd.h include/complib/cl_debug_osd.h
|
|
--- a/include/complib/cl_debug_osd.h 2019-04-17 04:02:47.000000000 -0400
|
|
+++ b/include/complib/cl_debug_osd.h 2019-04-17 11:56:45.870471013 -0400
|
|
@@ -42,7 +42,7 @@
|
|
#define _CL_DEBUG_OSD_H_
|
|
|
|
#include <complib/cl_types.h>
|
|
-#include <bits/wordsize.h>
|
|
+#include <stdint.h>
|
|
|
|
#ifdef __cplusplus
|
|
# define BEGIN_C_DECLS extern "C" {
|
|
diff -ru a/include/complib/cl_types.h include/complib/cl_types.h
|
|
--- a/include/complib/cl_types.h 2019-04-17 04:02:47.000000000 -0400
|
|
+++ b/include/complib/cl_types.h 2019-04-17 11:57:35.064280498 -0400
|
|
@@ -56,6 +56,9 @@
|
|
BEGIN_C_DECLS
|
|
#include <complib/cl_types_osd.h>
|
|
#include <stddef.h>
|
|
+#ifndef __GLIBC__
|
|
+#include <bits/reg.h>
|
|
+#endif
|
|
typedef uint16_t net16_t;
|
|
typedef uint32_t net32_t;
|
|
typedef uint64_t net64_t;
|
|
diff -ru a/opensm/osm_db_files.c opensm/osm_db_files.c
|
|
--- a/opensm/osm_db_files.c 2019-04-17 04:02:47.000000000 -0400
|
|
+++ b/opensm/osm_db_files.c 2019-04-17 11:58:57.600529423 -0400
|
|
@@ -394,7 +394,7 @@
|
|
p_accum_val);
|
|
|
|
/* check that the key is a number */
|
|
- if (!strtouq(p_key, &endptr, 0)
|
|
+ if (!strtoull(p_key, &endptr, 0)
|
|
&& *endptr != '\0') {
|
|
OSM_LOG(p_log, OSM_LOG_ERROR,
|
|
"ERR 610B: "
|