From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-989525-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 471EB139083 for <garchives@archives.gentoo.org>; Sun, 10 Dec 2017 12:39:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B24AE1014; Sun, 10 Dec 2017 12:39:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 393E6E1014 for <gentoo-commits@lists.gentoo.org>; Sun, 10 Dec 2017 12:39:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D14B133BDE1 for <gentoo-commits@lists.gentoo.org>; Sun, 10 Dec 2017 12:39:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 747D6AE6F for <gentoo-commits@lists.gentoo.org>; Sun, 10 Dec 2017 12:39:39 +0000 (UTC) From: "Mats Lidell" <matsl@gentoo.org> 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" <matsl@gentoo.org> Message-ID: <1512909320.de27d8e5c53b1aaca10875b5fe5f5a19a7a9dcaf.matsl@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/xemacs/xemacs-21.4.24-r1.ebuild app-editors/xemacs/xemacs-21.4.24.ebuild app-editors/xemacs/xemacs-21.5.34-r4.ebuild X-VCS-Directories: app-editors/xemacs/ X-VCS-Committer: matsl X-VCS-Committer-Name: Mats Lidell X-VCS-Revision: de27d8e5c53b1aaca10875b5fe5f5a19a7a9dcaf X-VCS-Branch: master Date: Sun, 10 Dec 2017 12:39:39 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 329ea985-6572-44f1-8f4f-c1002f98d37d X-Archives-Hash: ac4fbc1282169b6b86703ad78fbf3d7d commit: de27d8e5c53b1aaca10875b5fe5f5a19a7a9dcaf Author: Mats Lidell <matsl <AT> gentoo <DOT> org> AuthorDate: Sun Dec 10 12:34:21 2017 +0000 Commit: Mats Lidell <matsl <AT> gentoo <DOT> org> CommitDate: Sun Dec 10 12:35:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de27d8e5 app-editors/xemacs: Use system malloc and -no-pie For 21.4 use system malloc on all architectures. For both 21.4 and 21.5 use -no-pie option since xemacs can't be built with positions indipendent code yet. This is for adopting to the 17.0 profiles which defaults to use PIE. Bug: https://bugs.gentoo.org/639214 Bug: https://bugs.gentoo.org/639508 Bug: https://bugs.gentoo.org/639642 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 18 +++++++----------- app-editors/xemacs/xemacs-21.4.24.ebuild | 18 +++++++----------- app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 9 ++++++--- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild index 4b120d8e087..980a68d80e3 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Note: xemacs currently does not work with a hardened profile. If you -# want to use xemacs on a hardened profile then compile with the -# -nopie flag in CFLAGS or help fix bug #75028. +# Note: xemacs currently does not work with position independent code +# so the build forces the use of the -no-pie option EAPI="5" @@ -86,6 +85,10 @@ src_prepare() { src_configure() { local myconf="" + # Can't build with pie. See bug #75028 + test-flags -no-pie >/dev/null && append-flags -no-pie + filter-flags -pie + if use X; then myconf="${myconf} --with-widgets=athena" @@ -156,14 +159,6 @@ src_configure() { myconf="${myconf} --without-database" fi - # fixes #21264, this should be fixed in 21.4.21 and has been fixed - # in 21.5 for sure. Now that 21.4.21 is out there is no real - # evidence that this indeed got fixed, so keep these exceptions - # for now. - use alpha && myconf="${myconf} --with-system-malloc" - use ppc64 && myconf="${myconf} --with-system-malloc" - use ia64 && myconf="${myconf} --with-system-malloc" - # Enabling modules will cause segfaults outside the XEmacs build directory use ia64 && myconf="${myconf} --without-modules" @@ -184,6 +179,7 @@ src_configure() { --compiler=$(tc-getCC) \ --prefix=/usr \ --with-ncurses \ + --with-system-malloc \ --with-msw=no \ --mail-locking=flock \ --with-site-lisp=yes \ diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild index daf6425d4da..4c1eaa52fd0 100644 --- a/app-editors/xemacs/xemacs-21.4.24.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Note: xemacs currently does not work with a hardened profile. If you -# want to use xemacs on a hardened profile then compile with the -# -nopie flag in CFLAGS or help fix bug #75028. +# Note: xemacs currently does not work with position independent code +# so the build forces the use of the -no-pie option EAPI="5" @@ -85,6 +84,10 @@ src_prepare() { src_configure() { local myconf="" + # Can't build with pie. See bug #75028 + test-flags -no-pie >/dev/null && append-flags -no-pie + filter-flags -pie + if use X; then myconf="${myconf} --with-widgets=athena" @@ -155,14 +158,6 @@ src_configure() { myconf="${myconf} --without-database" fi - # fixes #21264, this should be fixed in 21.4.21 and has been fixed - # in 21.5 for sure. Now that 21.4.21 is out there is no real - # evidence that this indeed got fixed, so keep these exceptions - # for now. - use alpha && myconf="${myconf} --with-system-malloc" - use ppc64 && myconf="${myconf} --with-system-malloc" - use ia64 && myconf="${myconf} --with-system-malloc" - # Enabling modules will cause segfaults outside the XEmacs build directory use ia64 && myconf="${myconf} --without-modules" @@ -186,6 +181,7 @@ src_configure() { --compiler=$(tc-getCC) \ --prefix=/usr \ --with-ncurses \ + --with-system-malloc \ --with-msw=no \ --mail-locking=flock \ --with-site-lisp=yes \ diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild index dec26af2cdb..d806967cce4 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Note: xemacs currently does not work with a hardened profile. If you -# want to use xemacs on a hardened profile then compile with the -# -nopie flag in CFLAGS or help fix bug #75028. +# Note: xemacs currently does not work with position independent code +# so the build forces the use of the -no-pie option EAPI=5 @@ -80,6 +79,10 @@ src_prepare() { src_configure() { local myconf="" + # bug #639642 + test-flags -no-pie >/dev/null && append-flags -no-pie + filter-flags -pie + if use X; then myconf="${myconf} --with-widgets=athena"