From 40f6852c62ee774dc9783292ed3d38d6330310b2 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Jul 2011 13:36:59 +0200
Subject: [PATCH] xbps-src: handle correctly {C,LD,CXX,CPP}FLAGS envvars.

---
 xbps-src/shutils/tmpl_funcs.sh.in | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in
index bce0591674..42935e977e 100644
--- a/xbps-src/shutils/tmpl_funcs.sh.in
+++ b/xbps-src/shutils/tmpl_funcs.sh.in
@@ -297,10 +297,29 @@ set_tmpl_common_vars()
 	fi
 	SRCPKGDESTDIR=${XBPS_DESTDIR}/${sourcepkg}-${version}
 
-	export CFLAGS="$XBPS_CFLAGS $CFLAGS"
-	export CXXFLAGS="$XBPS_CXXFLAGS $CXXFLAGS"
-	export CPPFLAGS="$XBPS_CPPFLAGS $CPPFLAGS"
-	export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS"
+	if [ -n "$XBPS_CFLAGS" -a -n "$CFLAGS" ]; then
+		export CFLAGS="$XBPS_CFLAGS $CFLAGS"
+	elif [ -n "$XBPS_CFLAGS" -a -z "$CFLAGS" ]; then
+		export CFLAGS="$XBPS_CFLAGS"
+	fi
+
+	if [ -n "$XBPS_CXXFLAGS" -a -n "$CXXFLAGS" ]; then
+		export CXXFLAGS="$XBPS_CXXFLAGS"
+	elif [ -n "$XBPS_CXXFLAGS" -a -z "$CXXFLAGS" ]; then
+		export CXXFLAGS="$XBPS_CXXFLAGS"
+	fi
+
+	if [ -n "$XBPS_CPPFLAGS" -a -n "$CPPFLAGS" ]; then
+		export CPPFLAGS="$XBPS_CPPFLAGS"
+	elif [ -n "$XBPS_CPPFLAGS" -a -z "$CPPFLAGS" ]; then
+		export CPPFLAGS="$XBPS_CPPFLAGS"
+	fi
+
+	if [ -n "$XBPS_LDFLAGS" -a -n "$LDFLAGS" ]; then
+		export LDFLAGS="$XBPS_LDFLAGS $LDFLAGS"
+	elif [ -n "$XBPS_LDFLAGS" -a -z "$LDFLAGS" ]; then
+		export LDFLAGS="$XBPS_LDFLAGS"
+	fi
 
 	if [ -n "$broken_as_needed" -a -n "$XBPS_LDFLAGS" ]; then
 		export XBPS_LDFLAGS="$(echo $XBPS_LDFLAGS|sed -e "s|-Wl,--as-needed||g")"