commit: c5757e21c174721dad7cedcf5a7a6642da4e1446 Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Mon Mar 26 02:52:17 2018 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Mon Mar 26 19:14:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5757e21
sys-auth/oath-toolkit: Fix building with GCC-7 Bug: https://bugs.gentoo.org/618100 Closes: https://github.com/gentoo/gentoo/pull/7618 Package-Manager: Portage-2.3.16, Repoman-2.3.6 (cherry picked from commit 99a631bb82f619d2553354ca5a0cdf535d4d018b) Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> .../files/oath-toolkit-2.6.2-gcc7.patch | 80 ++++++++++++++++++++++ sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild | 5 +- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch new file mode 100644 index 00000000000..18a0a277940 --- /dev/null +++ b/sys-auth/oath-toolkit/files/oath-toolkit-2.6.2-gcc7.patch @@ -0,0 +1,80 @@ +Bug: https://bugs.gentoo.org/618100 +Cherry-picked from upstream commits: https://github.com/coreutils/gnulib/commit/175b4e22f99e00996b72f822f5ae54dca8243d19 + https://github.com/coreutils/gnulib/commit/abae112b34572cd3869ce4fc81dddb5c2a7394c4 + +--- a/oathtool/gl/intprops.h ++++ b/oathtool/gl/intprops.h +@@ -23,6 +23,10 @@ + #include <limits.h> + #include <verify.h> + ++#ifndef __has_builtin ++# define __has_builtin(x) 0 ++#endif ++ + /* Return a value with the common real type of E and V and the value of V. */ + #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) + +@@ -222,20 +226,24 @@ + ? (a) < (min) >> (b) \ + : (max) >> (b) < (a)) + +-/* True if __builtin_add_overflow (A, B, P) works when P is null. */ +-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__) ++/* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ ++#define _GL_HAS_BUILTIN_OVERFLOW \ ++ (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)) ++ ++#define _GL_HAS_BUILTIN_OVERFLOW_P \ ++ (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) + + /* The _GL*_OVERFLOW macros have the same restrictions as the + *_RANGE_OVERFLOW macros, except that they do not assume that operands + (e.g., A and B) have the same type as MIN and MAX. Instead, they assume + that the result (e.g., A + B) has that type. */ +-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL +-# define _GL_ADD_OVERFLOW(a, b, min, max) +- __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0) +-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) +- __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0) +-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) +- __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0) ++#if _GL_HAS_BUILTIN_OVERFLOW_P ++# define _GL_ADD_OVERFLOW(a, b, min, max) \ ++ __builtin_add_overflow_p (a, b, (a) + (b)) ++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \ ++ __builtin_sub_overflow_p (a, b, (a) - (b)) ++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \ ++ __builtin_mul_overflow_p (a, b, (a) * (b)) + #else + # define _GL_ADD_OVERFLOW(a, b, min, max) \ + ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \ +@@ -315,7 +323,7 @@ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW) + #define INT_SUBTRACT_OVERFLOW(a, b) \ + _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW) +-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL ++#if _GL_HAS_BUILTIN_OVERFLOW || _GL_HAS_BUILTIN_OVERFLOW_P + # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a) + #else + # define INT_NEGATE_OVERFLOW(a) \ +@@ -349,10 +357,6 @@ + #define INT_MULTIPLY_WRAPV(a, b, r) \ + _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW) + +-#ifndef __has_builtin +-# define __has_builtin(x) 0 +-#endif +- + /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See: + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193 + https://llvm.org/bugs/show_bug.cgi?id=25390 +@@ -369,7 +373,7 @@ + the operation. BUILTIN is the builtin operation, and OVERFLOW the + overflow predicate. Return 1 if the result overflows. See above + for restrictions. */ +-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow) ++#if _GL_HAS_BUILTIN_OVERFLOW + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r) + #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS + # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \ diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild index 394a6ea3c5f..f3d38999c1e 100644 --- a/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild +++ b/sys-auth/oath-toolkit/oath-toolkit-2.6.2.ebuild @@ -20,7 +20,11 @@ DEPEND="${RDEPEND} test? ( dev-libs/libxml2 ) dev-util/gtk-doc-am" +PATCHES=( "${FILESDIR}"/${P}-gcc7.patch ) + src_prepare() { + default + # These tests need git/cvs and don't reflect anything in the final app sed -i -r \ -e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \ @@ -30,7 +34,6 @@ src_prepare() { -e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \ {liboath,libpskc}/configure.ac eautoreconf - default } src_configure() {
