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
```
21 lines
797 B
Diff
21 lines
797 B
Diff
When using sysroot we should append it to libdir, which is helpful in
|
|
cross builds as the system is staged in the sysroot. For normal builds,
|
|
i.e. when lt_sysroot is not set, it will still behave the same and add
|
|
-L/usr/lib to the relink command.
|
|
|
|
-Khem Raj <raj.khem@gmail.com>
|
|
|
|
Adapted to libtool-2.4.6 build-aux/ltmain.in
|
|
Jürgen Buchmüller <pullmoll@t-online.de>
|
|
|
|
--- a/build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100
|
|
+++ b/build-aux/ltmain.in 2015-10-20 13:40:29.959988582 +0200
|
|
@@ -6456,7 +6456,7 @@
|
|
fi
|
|
else
|
|
# We cannot seem to hardcode it, guess we'll fake it.
|
|
- add_dir=-L$libdir
|
|
+ add_dir="-L$lt_sysroot$libdir"
|
|
# Try looking first in the location we're being installed to.
|
|
if test -n "$inst_prefix_dir"; then
|
|
case $libdir in
|