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
```
19 lines
617 B
Diff
19 lines
617 B
Diff
diff -up build-aux/ltmain.sh
|
|
--- a/build-aux/ltmain.sh 2013-12-03 16:36:53.222107642 +0100
|
|
+++ b/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100
|
|
@@ -5664,6 +5664,15 @@ func_mode_link ()
|
|
*" $arg "*) ;;
|
|
* ) func_append new_inherited_linker_flags " $arg" ;;
|
|
esac
|
|
+ # As we are forced to pass -nostdlib to g++ during linking, the option
|
|
+ # -pthread{,s} is not in effect; add the -lpthread to $deplist
|
|
+ # explicitly to link correctly.
|
|
+ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
|
|
+ case "$arg" in
|
|
+ -pthread*) func_append deplibs " -lpthread" ;;
|
|
+ esac
|
|
+ fi
|
|
+
|
|
continue
|
|
;;
|
|
|