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 BEF311381F3 for ; Sat, 10 Oct 2020 04:59:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 938C9E088F; Sat, 10 Oct 2020 04:59:31 +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 6A798E088F for ; Sat, 10 Oct 2020 04:59:31 +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 474E4340F56 for ; Sat, 10 Oct 2020 04:59:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E966226 for ; Sat, 10 Oct 2020 04:59:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1602305909.fed7eb00df36cec72f22422b72973fe1723d5d86.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/sam2p/, media-gfx/sam2p/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/sam2p/files/sam2p-build-fixes.patch media-gfx/sam2p/files/sam2p-configure-strip.patch media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild X-VCS-Directories: media-gfx/sam2p/files/ media-gfx/sam2p/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fed7eb00df36cec72f22422b72973fe1723d5d86 X-VCS-Branch: master Date: Sat, 10 Oct 2020 04:59:28 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ed3ef14-9742-4918-9a73-89cc89a372e4 X-Archives-Hash: 685d9c6c552d5409d04521b110be12da commit: fed7eb00df36cec72f22422b72973fe1723d5d86 Author: John Helmert III posteo net> AuthorDate: Sat Oct 10 03:15:13 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 10 04:58:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed7eb00 media-gfx/sam2p: correct compiler configuration Closes: https://bugs.gentoo.org/746638 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: John Helmert III posteo.net> Closes: https://github.com/gentoo/gentoo/pull/17869 Signed-off-by: Sam James gentoo.org> media-gfx/sam2p/files/sam2p-build-fixes.patch | 53 ++++++++++++++++++++++ media-gfx/sam2p/files/sam2p-configure-strip.patch | 30 ------------ ...718.ebuild => sam2p-0.49.4_p20190718-r1.ebuild} | 8 ++-- 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/media-gfx/sam2p/files/sam2p-build-fixes.patch b/media-gfx/sam2p/files/sam2p-build-fixes.patch new file mode 100644 index 00000000000..6a1c8017512 --- /dev/null +++ b/media-gfx/sam2p/files/sam2p-build-fixes.patch @@ -0,0 +1,53 @@ +Make stripping configurable, correct CC/CXX/CFLAGS/CXXFLAGS handling, add +missing include + +diff --git a/Makefile b/Makefile +index 1433167..38bb7cc 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force) + MAKE_DIST=000 + endif + ++GCC_STRIP ?= -s + BASH=bash + PERL_BADLANG=x + export PERL_BADLANG + + CXXX=$(CXD_assert) +-LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS) ++LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS) + ifeq ($(ENABLE_DEBUG), no) + CXXX=$(CXD_no) + endif +@@ -46,8 +47,8 @@ CXXX=$(CXD_checker) + LDALL=checkerg++ $(LDFLAGS) $(LIBS) + endif + +-CXXALL=$(CXXX) $(CXXFLAGS) $(CXXFLAGSB) +-CCALL =$(CXXX) $(CXXFLAGS) $(CXXFLAGSB) ++CXXALL=$(CXX) $(CXXFLAGS) $(CXXFLAGSB) ++CCALL =$(CC) $(CFLAGS) $(CXXFLAGSB) + CXDFAL=$(CXXFLAGS) $(CXXFLAGSB) $(LDFLAGS) $(LIBS) + + .PHONY: clean dist dist-noautoconf dist-more allclean distclean dist-install +@@ -67,7 +68,7 @@ ifeq ($(MAKE_DIST),) + # + # echo to config.h is needed to make config.h younger than config.h.in; + # configure doesn't change the timestamp of config.h if it's unchanged. +- Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h; ./configure MAKE=$(MAKE) --enable-gif --enable-lzw && echo "" >>config.h ++ Makedep config.h: configure Makehelp.in config.h.in ccdep.pl sam2p_version.h; + Makehelp:; + include Makehelp # Defines CXX. File generated by ./configure. + include Makedep # Contains ALL+=... . +@@ -101,8 +102,8 @@ IDE_MODES := release debug + IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS)) + IDE_TARGETS_release := $(TARGETS) + +-CXD_assert =$(CXX) -s -O2 +-CXD_no =$(CXX) -s -DNDEBUG -O3 ++CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS) ++CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS) + # CXD_yes =$(CXX) $(GFLAG) -lefence + CXD_yes =$(CXX) $(GFLAG) + CXD_checker=checkerg++ $(GFLAG) diff --git a/media-gfx/sam2p/files/sam2p-configure-strip.patch b/media-gfx/sam2p/files/sam2p-configure-strip.patch deleted file mode 100644 index be78fad0f73..00000000000 --- a/media-gfx/sam2p/files/sam2p-configure-strip.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Makefile b/Makefile -index 1433167..b662e33 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,12 +28,13 @@ ifeq ($(MAKECMDGOALS),Makedep.force) - MAKE_DIST=000 - endif - -+GCC_STRIP ?= -s - BASH=bash - PERL_BADLANG=x - export PERL_BADLANG - - CXXX=$(CXD_assert) --LDALL=$(LDXX) -s $(LDFLAGS) $(LIBS) -+LDALL=$(LDXX) $(GCC_STRIP) $(LDFLAGS) $(LIBS) - ifeq ($(ENABLE_DEBUG), no) - CXXX=$(CXD_no) - endif -@@ -101,8 +102,8 @@ IDE_MODES := release debug - IDE_TARGETS_debug := $(patsubst %,%.yes, $(TARGETS)) - IDE_TARGETS_release := $(TARGETS) - --CXD_assert =$(CXX) -s -O2 --CXD_no =$(CXX) -s -DNDEBUG -O3 -+CXD_assert =$(CXX) $(GCC_STRIP) $(CXXFLAGS) -+CXD_no =$(CXX) $(GCC_STRIP) $(CXXFLAGS) - # CXD_yes =$(CXX) $(GFLAG) -lefence - CXD_yes =$(CXX) $(GFLAG) - CXD_checker=checkerg++ $(GFLAG) diff --git a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild similarity index 84% rename from media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild rename to media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild index 2460983318f..e95883c8eca 100644 --- a/media-gfx/sam2p/sam2p-0.49.4_p20190718.ebuild +++ b/media-gfx/sam2p/sam2p-0.49.4_p20190718-r1.ebuild @@ -21,7 +21,7 @@ BDEPEND="dev-lang/perl" S="${WORKDIR}/${PN}-${COMMIT}" -PATCHES=( "${FILESDIR}"/${PN}-configure-strip.patch ) +PATCHES=( "${FILESDIR}"/${PN}-build-fixes.patch ) src_prepare() { default @@ -29,15 +29,15 @@ src_prepare() { # configure.in files are deprecated mv configure.{in,ac} || die - # upstream thinks they're being helpful by running configure with `make` - sed -i '/Makedep/s/ .\/configure.*//' Makefile || die + # missing include for memset + sed -i '1s;^;#include \n;' pts_defl.c # eautoreconf is still needed or you get bad warnings eautoreconf } src_configure() { - tc-export CXX + tc-export CC CXX econf \ --enable-lzw \