[gentoo-commits] repo/gentoo:master commit in: sci-visualization/gnuplot/

[Mike Frysinger]

commit:     cae0c8e14f6c43f8dcd94982cc3d977ae08da713
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 22:50:47 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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 \