From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 42BCF1382C5 for ; Tue, 23 Jan 2018 09:35:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95EA9E097B; Tue, 23 Jan 2018 09:35:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 68C15E097B for ; Tue, 23 Jan 2018 09:35:56 +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 59E66335C49 for ; Tue, 23 Jan 2018 09:35:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D522E1C9 for ; Tue, 23 Jan 2018 09:35:53 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1516700131.622178a43687a38321af43de225f6faa236e6445.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/snes9x/files/, games-emulation/snes9x/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/snes9x/files/snes9x-1.55-build-system.patch games-emulation/snes9x/snes9x-1.55.ebuild X-VCS-Directories: games-emulation/snes9x/files/ games-emulation/snes9x/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 622178a43687a38321af43de225f6faa236e6445 X-VCS-Branch: master Date: Tue, 23 Jan 2018 09:35:53 +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: a5a99b86-1f94-4f85-8a3a-5c443edccdcb X-Archives-Hash: da318eec4d9a5b25634bf5b9720efc97 commit: 622178a43687a38321af43de225f6faa236e6445 Author: David Seifert gentoo org> AuthorDate: Tue Jan 23 09:35:31 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Jan 23 09:35:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622178a4 games-emulation/snes9x: Fix broken build system Closes: https://bugs.gentoo.org/645330 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../snes9x/files/snes9x-1.55-build-system.patch | 63 ++++++++++++++++++++++ games-emulation/snes9x/snes9x-1.55.ebuild | 5 +- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch new file mode 100644 index 00000000000..30811ef421e --- /dev/null +++ b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch @@ -0,0 +1,63 @@ +--- a/gtk/configure.ac ++++ b/gtk/configure.ac +@@ -33,7 +33,7 @@ + + AM_GLIB_GNU_GETTEXT + +-snes9xlocaledir='${prefix}/${DATADIRNAME}/locale' ++snes9xlocaledir='$(localedir)' + AC_SUBST(snes9xlocaledir) + + AC_ARG_WITH(debug, +--- a/unix/configure.ac ++++ b/unix/configure.ac +@@ -56,49 +56,6 @@ + # *** Execution begins here *** + # ***************************** + +-# Remove -g and -O2 flags manually. +- +-if test "x$CFLAGS" != "x"; then +- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`" +- CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`" +-fi +- +-if test "x$CXXFLAGS" != "x"; then +- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`" +- CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`" +-fi +- +-# Test what compiler flags we should use. +- +-AC_ARG_ENABLE([debug], +- [AS_HELP_STRING([--enable-debug], +- [leave debug information in the final binary (default: no)])], +- [], [enable_debug="no"]) +- +-if test "x$enable_debug" = "xyes"; then +- AC_S9X_COMPILER_FLAG([-g], [g]) +- AC_S9X_COMPILER_FLAG([-O0], [o0]) +-else +- AC_S9X_COMPILER_FLAG([-O3], [o3], [ +- AC_S9X_COMPILER_FLAG([-O2], [o2], [ +- AC_S9X_COMPILER_FLAG([-O1], [o1])])]) +- AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer]) +-fi +- +-AC_ARG_ENABLE([mtune], +- [AS_HELP_STRING([--enable-mtune], +- [use the specified value for the -mtune/-mcpu flag (default: no)])], +- [], [enable_mtune="no"]) +- +-if test "x$enable_mtune" != "xno"; then +- AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune], +- [ +- AC_MSG_WARN([-mtune failed, trying -mcpu...]) +- AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu], +- [AC_MSG_ERROR([Please specify a working value for --enable-mtune.])]) +- ]) +-fi +- + AC_S9X_COMPILER_FLAG([-fno-exceptions], [no_exceptions]) + AC_S9X_COMPILER_FLAG([-fno-rtti], [no_rtti]) + AC_S9X_COMPILER_FLAG([-pedantic], [pedantic]) diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild index cf70b572d8c..ba25e25b642 100644 --- a/games-emulation/snes9x/snes9x-1.55.ebuild +++ b/games-emulation/snes9x/snes9x-1.55.ebuild @@ -40,7 +40,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${P}/unix" -PATCHES=( "${FILESDIR}"/${PN}-1.53-cross-compile.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.53-cross-compile.patch + "${FILESDIR}"/${PN}-1.55-build-system.patch +) src_prepare() { cd "${WORKDIR}"/${P} || die