MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'zlib-pie' into 'master'

Browse Source 
Set zlib as pie to fix libz-sys

See merge request redox-os/redox!2180
This commit is contained in:
Jeremy Soller 2026-06-06 06:05:23 -06:00
commit cf074ee1b6
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
recipes/libs/zlib/recipe.toml
View File

@ -5,14 +5,11 @@ blake3 = "ec1abc6f672a7a6ee6f49ba544cc9529f73121b478310473be44fee22a140ebf"
[build]
template = "custom"
script = """
DYNAMIC_INIT
COOKBOOK_CONFIGURE_FLAGS=(--prefix="/usr")
if [ "${COOKBOOK_DYNAMIC}" == "1" ]
then
COOKBOOK_CONFIGURE_FLAGS+=(--shared)
else
COOKBOOK_CONFIGURE_FLAGS+=(--static)
fi
DYNAMIC_STATIC_INIT
COOKBOOK_CONFIGURE_FLAGS=(--prefix="/usr" --shared --static)
# TODO: fPIC is the default on linux but not on redox and
# required by libz-sys as zlib statically linked there
export CFLAGS="$CFLAGS -fPIC"
# See https://stackoverflow.com/questions/21396988/zlib-build-not-configuring-properly-with-cross-compiler-ignores-ar.
env CHOST="${TARGET}" "${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
"${COOKBOOK_MAKE}" -j "$(nproc)"
@ -22,4 +19,4 @@ if [ -e "${solib}" ]
then
patchelf --set-soname 'libz.so.1.3' "${solib}"
fi
"""
"""