commit:     4c879dd8a26aa2227f51921164ac928f737dd126
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 20:36:50 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 20:37:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c879dd8

dev-lang/gnat-gpl: backport libatomic/libitm -Werror fix to 2017

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../files/gnat-gpl-2017-libatomic-Werror.patch        | 19 +++++++++++++++++++
 .../gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch  | 19 +++++++++++++++++++
 dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild             |  2 ++
 3 files changed, 40 insertions(+)

diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-libatomic-Werror.patch 
b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libatomic-Werror.patch
new file mode 100644
index 00000000000..0550722d170
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libatomic-Werror.patch
@@ -0,0 +1,19 @@
+libatomic does not respect --disable-werror
+
+https://bugs.gentoo.org/475350
+--- a/libatomic/configure.ac
++++ b/libatomic/configure.ac
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
+--- a/libatomic/configure
++++ b/libatomic/configure
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi

diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch 
b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch
new file mode 100644
index 00000000000..27181e02cfb
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2017-libitm-Werror.patch
@@ -0,0 +1,19 @@
+libitm does not respect --disable-werror
+
+https://bugs.gentoo.org/475350
+--- a/libitm/configure.ac
++++ b/libitm/configure.ac
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi
+--- a/libitm/configure
++++ b/libitm/configure
+@@ -4282,4 +4282,4 @@ save_CFLAGS="$CFLAGS"
+ # Add -Wall -Werror if we are using GCC.
+ if test "x$GCC" = "xyes"; then
+-  XCFLAGS="$XCFLAGS -Wall -Werror"
++  XCFLAGS="$XCFLAGS -Wall"
+ fi

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild 
b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
index 636000b373e..bff11256c1f 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -126,6 +126,8 @@ src_prepare() {
 
        toolchain_src_prepare
        eapply "${FILESDIR}"/${P}-libgomp-Werror.patch
+       eapply "${FILESDIR}"/${P}-libatomic-Werror.patch
+       eapply "${FILESDIR}"/${P}-libitm-Werror.patch
 }
 
 src_configure() {

Reply via email to