This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=e00fe1cd0de50d29b4ecf0d8df1bfb98fae4a08c commit e00fe1cd0de50d29b4ecf0d8df1bfb98fae4a08c Author: Guillem Jover <[email protected]> AuthorDate: Wed Jul 8 04:47:52 2020 +0200 Revert "data: Prefix the specs file spec string self_spec with + instead of *" This reverts commit 73ff957bb512a2fd0a1cdd714ebe6d5c82f1b596. The prefix is supposed to go in the text itself instead of the spec name, which already had it. This change only apparently fixed the issue at hand because gcc started parsing it as the «[SUFFIX]:» case, completely disabling the PIE handling. Thanks-to: Thorsten Glaser <[email protected]> --- data/no-pie-compile.specs | 2 +- data/no-pie-link.specs | 2 +- data/pie-compile.specs | 2 +- data/pie-link.specs | 2 +- debian/changelog | 8 ++++++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/data/no-pie-compile.specs b/data/no-pie-compile.specs index 70cb36095..2277b97ef 100644 --- a/data/no-pie-compile.specs +++ b/data/no-pie-compile.specs @@ -1,2 +1,2 @@ -+self_spec: +*self_spec: + %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fno-PIE}}}}}} diff --git a/data/no-pie-link.specs b/data/no-pie-link.specs index fa4162793..54db649b1 100644 --- a/data/no-pie-link.specs +++ b/data/no-pie-link.specs @@ -1,2 +1,2 @@ -+self_spec: +*self_spec: + %{!shared:%{!r:%{!fPIE:%{!pie:-fno-PIE -no-pie}}}} diff --git a/data/pie-compile.specs b/data/pie-compile.specs index c1ee08c71..74d82155c 100644 --- a/data/pie-compile.specs +++ b/data/pie-compile.specs @@ -1,2 +1,2 @@ -+self_spec: +*self_spec: + %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:%{!fno-PIE:%{!no-pie:-fPIE}}}}}}}} diff --git a/data/pie-link.specs b/data/pie-link.specs index 9b401e34a..94c122fd3 100644 --- a/data/pie-link.specs +++ b/data/pie-link.specs @@ -1,2 +1,2 @@ -+self_spec: +*self_spec: + %{!static:%{!shared:%{!r:%{!fno-PIE:%{!no-pie:-fPIE -pie}}}}} diff --git a/debian/changelog b/debian/changelog index c390f932c..7abb0513e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,13 @@ dpkg (1.20.5) UNRELEASED; urgency=medium + [ Guillem Jover ] + * Revert change to prefix the specs file spec string self_spec with + + instead of *. The prefix is supposed to go in the text itself + instead of the spec name, which already had it. This change only + apparently fixed the issue at hand because gcc started parsing it as + the «[SUFFIX]:» case, completely disabling the PIE handling. + Thanks to Thorsten Glaser <[email protected]>. + [ Updated scripts translations ] * German (Helge Kreutzmann). -- Dpkg.Org's dpkg
