diff --git a/component/fish-shell/buildout.cfg b/component/fish-shell/buildout.cfg index 86a0a7131b6f96b9a8156d9d7276d05fd27da967..da6af9785d67959a70a95d923b40df41e7382454 100644 --- a/component/fish-shell/buildout.cfg +++ b/component/fish-shell/buildout.cfg @@ -3,13 +3,14 @@ [buildout] parts = fish-shell extends = - ../cmake/buildout.cfg - ../zlib/buildout.cfg ../bzip2/buildout.cfg + ../cmake/buildout.cfg + ../gettext/buildout.cfg ../ncurses/buildout.cfg + ../pcre2/buildout.cfg ../readline/buildout.cfg - ../gettext/buildout.cfg ../xz-utils/buildout.cfg + ../zlib/buildout.cfg [fish-shell] recipe = slapos.recipe.cmmi @@ -22,13 +23,15 @@ configure-options = -DCMAKE_C_FLAGS="${:CMAKE_CFLAGS}" -DCMAKE_CXX_FLAGS="${:CMAKE_CFLAGS}" -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH} + -DFISH_USE_SYSTEM_PCRE2=ON + -DSYS_PCRE2_INCLUDE_DIR=${pcre2:location}/include environment = 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_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 -CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include -CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib +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:${pcre2:location}/lib location = @@LOCATION@@ diff --git a/component/pcre2/buildout.cfg b/component/pcre2/buildout.cfg index ab9fab9a54c2f7bf8cdae1c22da84abefbc2bb86..f1c7bf526a74bae8b3f292bbca90906795f8af0a 100644 --- a/component/pcre2/buildout.cfg +++ b/component/pcre2/buildout.cfg @@ -1,5 +1,5 @@ [buildout] -exends = +extends = ../cmake/buildout.cfg parts = pcre2