Commit 37bdd3c0 authored by Jérome Perrin's avatar Jérome Perrin

component/util-linux: build with slapos ncurses

We were using --without-ncurses but this does not prevent the build
from using system package when ncurses-dev system package is installed.
parent 9f2b6d4c
[buildout] [buildout]
extends = extends =
../perl/buildout.cfg ../perl/buildout.cfg
../ncurses/buildout.cfg
../libcap-ng/buildout.cfg ../libcap-ng/buildout.cfg
../pkgconfig/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
[util-linux] [util-linux]
...@@ -41,15 +43,15 @@ configure-options = ...@@ -41,15 +43,15 @@ configure-options =
--disable-wall --disable-wall
--without-libiconv-prefix --without-libiconv-prefix
--without-libintl-prefix --without-libintl-prefix
--without-ncurses
--without-slang --without-slang
--without-selinux --without-selinux
--without-audit --without-audit
--with-cap-ng=${libcap-ng:location} --with-cap-ng=${libcap-ng:location}
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:${pkgconfig:location}/bin:%(PATH)s
LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib LDFLAGS=-L${libcap-ng:location}/lib -Wl,-rpath=${libcap-ng:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
CFLAGS=-I${libcap-ng:location}/include CFLAGS=-I${libcap-ng:location}/include -I${ncurses:location}/include
PKG_CONFIG_PATH=${ncurses:location}/lib/pkgconfig
[libuuid] [libuuid]
# libuuid is inside util-linux source code with only libuuid feature enabled. # libuuid is inside util-linux source code with only libuuid feature enabled.
...@@ -60,7 +62,6 @@ configure-options = ...@@ -60,7 +62,6 @@ configure-options =
--enable-libuuid --enable-libuuid
--without-libiconv-prefix --without-libiconv-prefix
--without-libintl-prefix --without-libintl-prefix
--without-ncurses
--without-slang --without-slang
--without-pam --without-pam
--without-selinux --without-selinux
...@@ -68,3 +69,5 @@ configure-options = ...@@ -68,3 +69,5 @@ configure-options =
environment = environment =
PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
CFLAGS=-I${ncurses:location}/include
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment