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 496D4158089 for ; Mon, 18 Sep 2023 12:37:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF6CE2BC092; 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 A42E72BC092 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 B9CCF335D64 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 66F9011EB 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: <1694990360.772108d69dcde0ad8cf8590fb1f3e359fe349574.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/libbpg/, media-libs/libbpg/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch media-libs/libbpg/files/libbpg-0.9.8-respect-compiler-driver.patch media-libs/libbpg/libbpg-0.9.8-r1.ebuild X-VCS-Directories: media-libs/libbpg/ media-libs/libbpg/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 772108d69dcde0ad8cf8590fb1f3e359fe349574 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: 2b42e38b-0452-45b5-9838-32e074e181fe X-Archives-Hash: 4ee473ca4ff7ab8cac0eda0017959cd2 commit: 772108d69dcde0ad8cf8590fb1f3e359fe349574 Author: Lucio Sauer posteo net> AuthorDate: Sun Sep 17 21:50:46 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Sep 17 22:39:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=772108d6 media-libs/libbpg: Honor AR, CC and CXX from the user environment Signed-off-by: Lucio Sauer posteo.net> .../libbpg/files/libbpg-0.9.8-add-chost.patch | 13 ------------ .../libbpg-0.9.8-respect-compiler-driver.patch | 23 ++++++++++++++++++++++ media-libs/libbpg/libbpg-0.9.8-r1.ebuild | 7 +++---- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch b/media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch deleted file mode 100644 index 9b5054de1a..0000000000 --- a/media-libs/libbpg/files/libbpg-0.9.8-add-chost.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 8364e93..d3fc48f 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,7 +27,7 @@ CROSS_PREFIX:=x86_64-w64-mingw32- - #CROSS_PREFIX=i686-w64-mingw32- - EXE:=.exe - else --CROSS_PREFIX:= -+CROSS_PREFIX:=${CHOST}- - EXE:= - endif - diff --git a/media-libs/libbpg/files/libbpg-0.9.8-respect-compiler-driver.patch b/media-libs/libbpg/files/libbpg-0.9.8-respect-compiler-driver.patch new file mode 100644 index 0000000000..c253dadd5f --- /dev/null +++ b/media-libs/libbpg/files/libbpg-0.9.8-respect-compiler-driver.patch @@ -0,0 +1,23 @@ +Honor AR, CC and CXX from the user enviroment instead of relying on +${CHOST}-driver though it may be correct most of the time. +Author: Lucio Sauer +--- a/Makefile ++++ b/Makefile +@@ -27,13 +27,13 @@ CROSS_PREFIX:=x86_64-w64-mingw32- + #CROSS_PREFIX=i686-w64-mingw32- + EXE:=.exe + else +-CROSS_PREFIX:= ++CROSS_PREFIX:=${CHOST}- + EXE:= + endif + +-CC=$(CROSS_PREFIX)gcc +-CXX=$(CROSS_PREFIX)g++ +-AR=$(CROSS_PREFIX)ar ++CC ?= $(CROSS_PREFIX)gcc ++CXX ?= $(CROSS_PREFIX)g++ ++AR ?= $(CROSS_PREFIX)ar + EMCC=emcc + + PWD:=$(shell pwd) diff --git a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild index 484760e6fe..83f70801da 100644 --- a/media-libs/libbpg/libbpg-0.9.8-r1.ebuild +++ b/media-libs/libbpg/libbpg-0.9.8-r1.ebuild @@ -34,12 +34,12 @@ KEYWORDS="~amd64 ~x86" IUSE="bpgview jctvc" PATCHES=( - "${FILESDIR}"/${P}-add-chost.patch "${FILESDIR}"/${P}-add-fpic.patch "${FILESDIR}"/${P}-backport-GNU-stack-note-fix.patch "${FILESDIR}"/${P}-dont-strip-bins.patch "${FILESDIR}"/${P}-remove-forced-options.patch "${FILESDIR}"/${P}-remove-unused-cmake-var.patch + "${FILESDIR}"/${P}-respect-compiler-driver.patch "${FILESDIR}"/${P}-respect-user-flags.patch ) @@ -81,12 +81,11 @@ EOF } src_compile() { + tc-export AR CC CXX emake \ USE_X265=y \ $(usex bpgview USE_BPGVIEW=y '') \ - $(usex jctvc USE_JCTVC=y '') \ - CXX="$(tc-getCXX)" \ - CC="$(tc-getCC)" + $(usex jctvc USE_JCTVC=y '') } src_install() {