Commit 736fbb3b authored by Jérome Perrin's avatar Jérome Perrin

component/fish-shell: build with slapos pcre2

This was downloading pcre2 from git or using system package if available
parent 841f88aa
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
[buildout] [buildout]
parts = fish-shell parts = fish-shell
extends = extends =
../cmake/buildout.cfg
../zlib/buildout.cfg
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../cmake/buildout.cfg
../gettext/buildout.cfg
../ncurses/buildout.cfg ../ncurses/buildout.cfg
../pcre2/buildout.cfg
../readline/buildout.cfg ../readline/buildout.cfg
../gettext/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
../zlib/buildout.cfg
[fish-shell] [fish-shell]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -22,13 +23,15 @@ configure-options = ...@@ -22,13 +23,15 @@ configure-options =
-DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}" -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}"
-DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}" -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}"
-DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH} -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH}
-DFISH_USE_SYSTEM_PCRE2=ON
-DSYS_PCRE2_INCLUDE_DIR=${pcre2:location}/include
environment = environment =
CMAKE_PROGRAM_PATH=${cmake:location}/bin CMAKE_PROGRAM_PATH=${cmake:location}/bin
CMAKE_INCLUDE_PATH=${bzip2:location}/include:${zlib:location}/include:${ncurses:location}/include:${gettext:location}/include:${readline:location}/include CMAKE_INCLUDE_PATH=${bzip2:location}/include:${zlib:location}/include:${ncurses:location}/include:${gettext:location}/include:${readline:location}/include
CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH} CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${pcre2:location}/lib -Wl,-rpath=${pcre2:location}/lib
PATH=${xz-utils:location}/bin/:%(PATH)s PATH=${xz-utils:location}/bin/:%(PATH)s
CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include -I${pcre2:location}/include
CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib:${pcre2:location}/lib
location = @@LOCATION@@ location = @@LOCATION@@
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