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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDE42158089 for ; Mon, 18 Sep 2023 12:37:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A55B32BC097; Mon, 18 Sep 2023 12:37:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88D1D2BC092 for ; Mon, 18 Sep 2023 12:37:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D3F3335D54 for ; Mon, 18 Sep 2023 12:37:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51A7C11EA for ; Mon, 18 Sep 2023 12:37:15 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1694990359.f764b3ff11e2b43601748b6e55a880fbf419b4df.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/files/, media-libs/libbpg/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch media-libs/libbpg/libbpg-0.9.8-r1.ebuild X-VCS-Directories: media-libs/libbpg/files/ media-libs/libbpg/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: f764b3ff11e2b43601748b6e55a880fbf419b4df X-VCS-Branch: master Date: Mon, 18 Sep 2023 12:37:15 +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: ade309c1-dee7-4f5a-8968-c9519f07bd4a X-Archives-Hash: ca879c756f4a5ea837957ea31e71caef commit: f764b3ff11e2b43601748b6e55a880fbf419b4df Author: Lucio Sauer posteo net> AuthorDate: Sun Sep 17 21:41:31 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Sep 17 22:39:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f764b3ff media-libs/libbpg: respect LD, CXX and CFLAGS from the user enviroment Closes: https://bugs.gentoo.org/787683 Signed-off-by: Lucio Sauer posteo.net> .../files/libbpg-0.9.8-respect-user-flags.patch | 42 ++++++++++++++++++++++ media-libs/libbpg/libbpg-0.9.8-r1.ebuild | 1 + 2 files changed, 43 insertions(+) diff --git a/media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch b/media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch new file mode 100644 index 0000000000..4eaf8be30c --- /dev/null +++ b/media-libs/libbpg/files/libbpg-0.9.8-respect-user-flags.patch @@ -0,0 +1,42 @@ +Honor {C{,XX},LD}FLAGS from the user environment. Strip debugging flag -g +preemtively to avoid "... adds uncommon flags" bugs such as +https://bugs.gentoo.org/914187 +Author: Lucio Sauer +--- a/Makefile ++++ b/Makefile +@@ -38,6 +38,9 @@ EMCC=emcc + + PWD:=$(shell pwd) + ++GENTOO_CFLAGS:=${CFLAGS} ++GENTOO_CXXFLAGS:=${CXXFLAGS} ++ + CFLAGS:=-Os -Wall -MMD -fno-asynchronous-unwind-tables -fdata-sections -ffunction-sections -fno-math-errno -fno-signed-zeros -fno-tree-vectorize -fomit-frame-pointer + CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_REENTRANT + CFLAGS+=-I. +@@ -54,14 +57,12 @@ EMLDFLAGS+=-s NO_FILESYSTEM=1 -s NO_BROWSER=1 + EMLDFLAGS+=-O3 --memory-init-file 0 --closure 0 --pre-js pre.js --post-js post.js + EMCFLAGS:=$(CFLAGS) + +-LDFLAGS=-g + ifdef CONFIG_APPLE + LDFLAGS+=-Wl,-dead_strip + else +-LDFLAGS+=-Wl,--gc-sections ++LDFLAGS:=-Wl,--gc-sections ${LDFLAGS} + endif +-CFLAGS+=-g +-CXXFLAGS=$(CFLAGS) ++CXXFLAGS=$(CFLAGS) ${GENTOO_CXXFLAGS} + + PROGS=bpgdec$(EXE) bpgenc$(EXE) + ifdef USE_BPGVIEW +@@ -225,7 +226,7 @@ clean: x265_clean + $(addsuffix /*.a, $(CLEAN_DIRS)) + + %.o: %.c +- $(CC) $(CFLAGS) -c -o $@ $< ++ $(CC) $(CFLAGS) ${GENTOO_CFLAGS} -c -o $@ $< + + %.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< diff --git a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild index bba7f2fb63..484760e6fe 100644 --- a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild +++ b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}"/${P}-dont-strip-bins.patch "${FILESDIR}"/${P}-remove-forced-options.patch "${FILESDIR}"/${P}-remove-unused-cmake-var.patch + "${FILESDIR}"/${P}-respect-user-flags.patch ) # Libnuma is a dependency of the default (x265) encoder.