mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

Parse --disable-python in mkpkg and don't override -m32 for Solaris.

Browse Source 
We want to be able to build without python and to specify the memory
model when building 32-bit .so's for Solaris.
This commit is contained in:
Todd C. Miller 2023-08-01 09:36:39 -06:00
parent 0a181849a1
commit 8e22ede2a6
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/mkpkg
View File

@ -484,8 +484,15 @@ case "$osversion" in
if [ $osrelease -ge 11 ]; then if [ $osrelease -ge 11 ]; then
# Build 64-bit binaries on Solaris 11 and above. # Build 64-bit binaries on Solaris 11 and above.
case "${CC}${CFLAGS}" in
*-m32*|*-m64*)
# User specified memory model flags
;;
*)
CFLAGS="${CFLAGS:--O2 -g} -m64"; export CFLAGS CFLAGS="${CFLAGS:--O2 -g} -m64"; export CFLAGS
LDFLAGS="-m64${LDFLAGS:+ }${LDFLAGS}"; export LDFLAGS LDFLAGS="-m64${LDFLAGS:+ }${LDFLAGS}"; export LDFLAGS
;;
esac
# Solaris audit is not supported by Illumos # Solaris audit is not supported by Illumos
if [ X"`uname -o 2>/dev/null`" = X"illumos" ]; then if [ X"`uname -o 2>/dev/null`" = X"illumos" ]; then
configure_opts="${configure_opts}${configure_opts+$tab}--with-bsm-audit" configure_opts="${configure_opts}${configure_opts+$tab}--with-bsm-audit"
@ -541,10 +548,13 @@ case "$osversion" in
;; ;;
esac esac
# Don't enable OpenSSL if user disabled it. # Don't enable OpenSSL or python if disabled by the user.
case "$configure_opts" in case "$configure_opts" in
*--disable-openssl*) with_openssl=false;; *--disable-openssl*) with_openssl=false;;
esac esac
case "$configure_opts" in
*--disable-python*) with_python=false;;
esac
if [ X"$with_openssl" = X"true" ]; then if [ X"$with_openssl" = X"true" ]; then
configure_opts="${configure_opts}${configure_opts+$tab}--enable-openssl" configure_opts="${configure_opts}${configure_opts+$tab}--enable-openssl"
fi fi