From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D723458973 for ; Fri, 29 Jan 2016 22:53:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DB81E0875; Fri, 29 Jan 2016 22:53:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A342E0875 for ; Fri, 29 Jan 2016 22:53:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DC80340AE2 for ; Fri, 29 Jan 2016 22:53:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8F718DA for ; Fri, 29 Jan 2016 22:53:43 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1454108012.cae0c8e14f6c43f8dcd94982cc3d977ae08da713.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gnuplot/gnuplot-4.6.5.ebuild sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild X-VCS-Directories: sci-visualization/gnuplot/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: cae0c8e14f6c43f8dcd94982cc3d977ae08da713 X-VCS-Branch: master Date: Fri, 29 Jan 2016 22:53:43 +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: a281584d-db0f-4e16-acfb-83fc93683a35 X-Archives-Hash: 6ef14c74fa88da52732d81cbf77d4181 commit: cae0c8e14f6c43f8dcd94982cc3d977ae08da713 Author: Mike Frysinger gentoo org> AuthorDate: Fri Jan 29 22:50:47 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Jan 29 22:53:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae0c8e1 sci-visualization/gnuplot: fix cross-compile builds The upstream build tries to set up CC_FOR_BUILD for building helper tools, but still mixes target compiler flags in which easily leads to failure. sci-visualization/gnuplot/gnuplot-4.6.5.ebuild | 9 +++++++++ sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild index b5f2965..3dd44b2 100644 --- a/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild @@ -104,6 +104,13 @@ src_prepare() { distributed separately; the gnuplot ebuild no longer installs it. Emerge app-emacs/gnuplot-mode for Emacs support.' has_version "${CATEGORY}/${PN}[emacs(-)]" && FORCE_PRINT_ELOG=1 + + # Make sure we don't mix build & host flags. + sed -i \ + -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \ + -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \ + -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \ + docs/Makefile.in || die } src_configure() { @@ -117,6 +124,8 @@ src_configure() { fi tc-export CC CXX #453174 + tc-export_build_env BUILD_CC + export CC_FOR_BUILD=${BUILD_CC} econf \ --without-pdf \ diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild index ad5b62d..ed43ed5 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild @@ -104,6 +104,14 @@ src_prepare() { mv configure.in configure.ac || die eautoreconf + + # Make sure we don't mix build & host flags. + sed -i \ + -e 's:@CPPFLAGS@:$(BUILD_CPPFLAGS):' \ + -e 's:@CFLAGS@:$(BUILD_CFLAGS):' \ + -e 's:@LDFLAGS@:$(BUILD_LDFLAGS):' \ + -e 's:@CC@:$(CC_FOR_BUILD):' \ + docs/Makefile.in || die } src_configure() { @@ -117,6 +125,8 @@ src_configure() { fi tc-export CC CXX #453174 + tc-export_build_env BUILD_CC + export CC_FOR_BUILD=${BUILD_CC} econf \ --without-pdf \