ncurses: fix PIE build, small cleanup.

This commit is contained in:
Christian Neukirchen 2015-11-18 17:16:32 +01:00
parent 6f2cccebab
commit 7fe9ca426c

View file

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