commit cfff46e0f6180d925fe0f5b06a5e7439d67875cf parent 77a97ce5c223aea8ebd30bf155a81feb12f43b66 Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 18 Dec 2025 20:21:10 +0000 vis: workaround configure ingoring CPPFLAGS Diffstat:
7 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/templates/pkg/vis b/templates/pkg/vis @@ -11,7 +11,8 @@ {% endblock package_deps -%} {%- block configure %} build_env_static -./configure \ +{# configure doesn't take CPPFLAGS into account when searching for libraries -#} +env CFLAGS="$CPPFLAGS $CFLAGS" ./configure \ --prefix="$prefix" \ --bindir="$prefix/{{bindir}}" \ --mandir="$prefix/{{mandir}}" \ diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -84,7 +84,7 @@ #+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1 #+findutils.efdc2b649d6fcaea4f7b4716e770de6197dbc3d02ce14907eeda729116f581e2 #+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60 -#+vis.5743cd24f74b6231ebdf13ce539a1e44844dfc9508b6c9644f29a5f610a2af23 +#+vis.bb8b27e12913f2585f0486f9eef82fe911bd671667e77c5c438aa58b4b223afc #+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946 #+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170 #+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7 diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -84,7 +84,7 @@ #+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1 #+findutils.efdc2b649d6fcaea4f7b4716e770de6197dbc3d02ce14907eeda729116f581e2 #+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60 -#+vis.5743cd24f74b6231ebdf13ce539a1e44844dfc9508b6c9644f29a5f610a2af23 +#+vis.bb8b27e12913f2585f0486f9eef82fe911bd671667e77c5c438aa58b4b223afc #+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946 #+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170 #+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7 \ No newline at end of file diff --git a/variants/ccx-x86_64/vis b/variants/ccx-x86_64/vis @@ -65,7 +65,7 @@ cd 'vis' build_env_static -./configure \ +env CFLAGS="$CPPFLAGS $CFLAGS" ./configure \ --prefix="$prefix" \ --bindir="$prefix/command" \ --mandir="$prefix/man" \ diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -84,7 +84,7 @@ #+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5 #+findutils.337df827b790b33c27518f2bf52fb537e3b5756ccdbde9dedfa26f6922395b60 #+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2 -#+vis.c632ea555bbdf561e541cca0233394697f650a156390838260589a1b99688c2e +#+vis.a4072654e55cedac53c626751bbfcff56a09d04999c9e72142a6f592d15014f0 #+squashfs-tools.1b91e9f3f87cc15a2eb60ab5b95325158a49b03c20c1262801491563d93311c6 #+mandoc.24165da5b9553ff75b2b70a43d8e584d7f71ab38aa329769e7425e57790e5712 #+tinyssh.b86b96a90e668bd3500db7bac7652e8654ec0dafd0b6c9486a02682cd31f515a diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -84,7 +84,7 @@ #+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5 #+findutils.337df827b790b33c27518f2bf52fb537e3b5756ccdbde9dedfa26f6922395b60 #+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2 -#+vis.c632ea555bbdf561e541cca0233394697f650a156390838260589a1b99688c2e +#+vis.a4072654e55cedac53c626751bbfcff56a09d04999c9e72142a6f592d15014f0 #+squashfs-tools.1b91e9f3f87cc15a2eb60ab5b95325158a49b03c20c1262801491563d93311c6 #+mandoc.24165da5b9553ff75b2b70a43d8e584d7f71ab38aa329769e7425e57790e5712 #+tinyssh.b86b96a90e668bd3500db7bac7652e8654ec0dafd0b6c9486a02682cd31f515a \ No newline at end of file diff --git a/variants/root-x86_64/vis b/variants/root-x86_64/vis @@ -65,7 +65,7 @@ cd 'vis' build_env_static -./configure \ +env CFLAGS="$CPPFLAGS $CFLAGS" ./configure \ --prefix="$prefix" \ --bindir="$prefix/command" \ --mandir="$prefix/man" \