From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C26AA59CAF for ; Sun, 3 Apr 2016 00:04:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF2B221C018; Sun, 3 Apr 2016 00:04:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A1CA21C018 for ; Sun, 3 Apr 2016 00:04:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BCEA340B63 for ; Sun, 3 Apr 2016 00:04:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA04D83 for ; Sun, 3 Apr 2016 00:04:26 +0000 (UTC) From: "Mats Lidell" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mats Lidell" Message-ID: <1459641521.a7e28a58e95bb7540eafb21353b18345749bc215.matsl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch app-editors/xemacs/xemacs-21.4.24.ebuild X-VCS-Directories: app-editors/xemacs/files/ app-editors/xemacs/ X-VCS-Committer: matsl X-VCS-Committer-Name: Mats Lidell X-VCS-Revision: a7e28a58e95bb7540eafb21353b18345749bc215 X-VCS-Branch: master Date: Sun, 3 Apr 2016 00:04:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3e292d8c-8ca5-498b-bc62-2f973409f2f4 X-Archives-Hash: 103e993250be2ecccbca0d04a68bf2f5 commit: a7e28a58e95bb7540eafb21353b18345749bc215 Author: Mats Lidell gentoo org> AuthorDate: Sat Apr 2 23:57:47 2016 +0000 Commit: Mats Lidell gentoo org> CommitDate: Sat Apr 2 23:58:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e28a58 app-editors/xemacs: gcc-5.3 patch. See bug 576512. Package-Manager: portage-2.2.26 app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch | 32 ++++++++++++++++++++++ app-editors/xemacs/xemacs-21.4.24.ebuild | 7 ++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch new file mode 100644 index 0000000..494fc51 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch @@ -0,0 +1,32 @@ +diff -r e2da872593c0 configure.in +--- a/configure.in Tue Mar 24 22:15:53 2015 -0400 ++++ b/configure.in Sun Mar 13 13:48:24 2016 +0100 +@@ -1939,6 +1939,8 @@ + CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes" + dnl Yuck, bad compares have been worth at least 3 crashes! + CFLAGS="$CFLAGS -Wsign-compare" ++ dnl Use old gnu inline semantics until we fix the source ++ CFLAGS="$CFLAGS -fgnu89-inline" + dnl XEmacs is known not to be strict-aliasing-safe. + case "`gcc -v --help 2>&1`" in + *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;; +diff -r e2da872593c0 src/lisp.h +--- a/src/lisp.h Tue Mar 24 22:15:53 2015 -0400 ++++ b/src/lisp.h Sun Mar 13 13:48:24 2016 +0100 +@@ -193,6 +193,8 @@ + # endif /* GNUC */ + #endif + ++#ifndef _GCC_MAX_ALIGN_T ++#define _GCC_MAX_ALIGN_T + /* No type has a greater alignment requirement than max_align_t. + (except perhaps for types we don't use, like long double) */ + typedef union +@@ -202,6 +204,7 @@ + struct { void (*f)(void); } f; + struct { double d; } d; + } max_align_t; ++#endif + + #ifndef ALIGNOF + # if defined (__GNUC__) && (__GNUC__ >= 2) diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild index 97f68ae..9ffda4d 100644 --- a/app-editors/xemacs/xemacs-21.4.24.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24.ebuild @@ -9,7 +9,7 @@ EAPI="5" WANT_AUTOCONF="2.1" -inherit autotools eutils toolchain-funcs +inherit autotools eutils flag-o-matic toolchain-funcs DESCRIPTION="highly customizable open source text editor and application development system" HOMEPAGE="http://www.xemacs.org/" @@ -62,6 +62,8 @@ src_unpack() { src_prepare() { # see bug 58350, 102540 and 143580 epatch "${FILESDIR}"/xemacs-21.4.19-db.patch + # see bug 576512 + epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). @@ -168,6 +170,9 @@ src_configure() { einfo "${myconf}" + # see bug 576512 + append-cflags -std=gnu89 + # Don't use econf because it uses options which this configure # script does not understand (like --host). ./configure ${myconf} ${EXTRA_ECONF} \