49cb564d14
* par is kept at -Np0
```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
```
83 lines
2.2 KiB
Diff
83 lines
2.2 KiB
Diff
From 423890b1db83fce87d1283293a3d207e8f18aff4 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Smirnov <civil@gentoo.org>
|
|
Date: Mon, 19 May 2014 19:44:44 +0400
|
|
Subject: [PATCH] Don't force -fstack-protector on everyone
|
|
|
|
Bug-Gentoo: https://bugs.gentoo.org/348557
|
|
|
|
Patch-Name: gentoo/drop_fstack_protector.diff
|
|
|
|
Original by Torsten Veller, ported to perl 5.20
|
|
|
|
|
|
diff -ruN perl-5.24.0-RC5.orig/Configure perl-5.24.0-RC5/Configure
|
|
--- a/Configure 2016-04-27 00:11:09.000000000 +0200
|
|
+++ b/Configure 2016-05-05 21:32:53.575232970 +0200
|
|
@@ -5474,23 +5474,6 @@
|
|
# is to add the flag to the flags passed to the compiler at link time,
|
|
# as that way the compiler can do the right implementation dependant
|
|
# thing. (NWC)
|
|
- case "$osname" in
|
|
- amigaos) ;; # -fstack-protector builds but doesn't work
|
|
- *) case "$gccversion" in
|
|
- ?*) set stack-protector-strong -fstack-protector-strong
|
|
- eval $checkccflag
|
|
- case "$dflt" in
|
|
- *-fstack-protector-strong*) ;; # It got added.
|
|
- *) # Try the plain/older -fstack-protector.
|
|
- set stack-protector -fstack-protector
|
|
- eval $checkccflag
|
|
- ;;
|
|
- esac
|
|
- ;;
|
|
- esac
|
|
- ;;
|
|
- esac
|
|
- ;;
|
|
esac
|
|
|
|
case "$mips_type" in
|
|
@@ -5633,21 +5616,6 @@
|
|
;;
|
|
*) dflt="$ldflags";;
|
|
esac
|
|
-# See note above about -fstack-protector
|
|
-case "$ccflags" in
|
|
-*-fstack-protector-strong*)
|
|
- case "$dflt" in
|
|
- *-fstack-protector-strong*) ;; # Don't add it again
|
|
- *) dflt="$dflt -fstack-protector-strong" ;;
|
|
- esac
|
|
- ;;
|
|
-*-fstack-protector*)
|
|
- case "$dflt" in
|
|
- *-fstack-protector*) ;; # Don't add it again
|
|
- *) dflt="$dflt -fstack-protector" ;;
|
|
- esac
|
|
- ;;
|
|
-esac
|
|
|
|
: Try to guess additional flags to pick up local libraries.
|
|
for thislibdir in $libpth; do
|
|
@@ -8570,21 +8538,6 @@
|
|
''|' ') dflt='none' ;;
|
|
esac
|
|
|
|
- case "$ldflags" in
|
|
- *-fstack-protector-strong*)
|
|
- case "$dflt" in
|
|
- *-fstack-protector-strong*) ;; # Don't add it again
|
|
- *) dflt="$dflt -fstack-protector-strong" ;;
|
|
- esac
|
|
- ;;
|
|
- *-fstack-protector*)
|
|
- case "$dflt" in
|
|
- *-fstack-protector*) ;; # Don't add it again
|
|
- *) dflt="$dflt -fstack-protector" ;;
|
|
- esac
|
|
- ;;
|
|
- esac
|
|
-
|
|
rp="Any special flags to pass to $ld to create a dynamically loaded library?"
|
|
. ./myread
|
|
case "$ans" in
|