From 7fe9ca426c831779bc9c886af39ce0c17219b2b5 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Wed, 18 Nov 2015 17:16:32 +0100
Subject: [PATCH] ncurses: fix PIE build, small cleanup.

---
 srcpkgs/ncurses/template | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 2fcdb4d11c5..875cff5ce76 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
 # Template build file for 'ncurses'.
 pkgname=ncurses
 version=6.0
-revision=1
+revision=2
 short_desc="A System V Release 4.0 curses emulation library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/ncurses/"
@@ -18,25 +18,29 @@ fi
 depends="ncurses-base-${version}_${revision}"
 
 do_configure() {
-	mkdir -p ncurses-build ncursesw-build
-	cd ${wrksrc}/ncursesw-build
-
-	# widec build
 	export CFLAGS="$CFLAGS -fPIC"
+	export BUILD_CFLAGS="$BUILD_CFLAGS -fPIC"
+
+	mkdir -p ncurses-build ncursesw-build
+
+	cd ${wrksrc}/ncursesw-build
+	# widec build
 	../configure ${configure_args} \
 		--enable-widec --with-shared --without-debug \
 		--with-manpage-symlinks --with-manpage-format=normal \
 		--without-ada --enable-ext-colors \
 		--without-tests --enable-pc-files \
 		--with-pkg-config-libdir=/usr/lib/pkgconfig \
-		ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
+		ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config \
+		BUILD_CFLAGS="$BUILD_CFLAGS"
 
 	cd ${wrksrc}/ncurses-build
 	# non-widec build
 	../configure ${configure_args} --with-shared \
 		--without-debug --without-ada --without-tests \
 		--enable-pc-files --with-pkg-config-libdir=/usr/lib/pkgconfig \
-		ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
+		ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config \
+		BUILD_CFLAGS="$BUILD_CFLAGS"
 }
 
 do_build() {