63 lines
2.1 KiB
Text
63 lines
2.1 KiB
Text
#1: Set ports library version
|
|
#2: Don't pick up an installed linux/e2fsprogs libuuid.so
|
|
#3: llvm-ar (used for LTO) is installed as ar
|
|
#4: OpenBSD isn't multi-arch
|
|
#5: Try only the right tcl/tk string
|
|
|
|
Index: configure.ac
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -249,7 +249,7 @@ VERSION=PYTHON_VERSION
|
|
|
|
# Version number of Python's own shared library file.
|
|
AC_SUBST(SOVERSION)
|
|
-SOVERSION=1.0
|
|
+SOVERSION=${LIBpython3.11_VERSION}
|
|
|
|
# The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
|
|
# certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
|
|
@@ -1096,6 +1096,7 @@ AC_MSG_CHECKING([for multiarch])
|
|
AS_CASE([$ac_sys_system],
|
|
[Darwin*], [MULTIARCH=""],
|
|
[FreeBSD*], [MULTIARCH=""],
|
|
+ [OpenBSD*], [MULTIARCH=""],
|
|
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
|
|
)
|
|
AC_SUBST([MULTIARCH])
|
|
@@ -1835,13 +1836,13 @@ esac
|
|
[AC_MSG_RESULT(no)])
|
|
if test "$Py_LTO" = 'true' ; then
|
|
case $CC in
|
|
- *clang*)
|
|
+ *clang*|cc)
|
|
LDFLAGS_NOLTO="-fno-lto"
|
|
dnl Clang linker requires -flto in order to link objects with LTO information.
|
|
dnl Thin LTO is faster and works for object files with full LTO information, too.
|
|
AX_CHECK_COMPILE_FLAG([-flto=thin],[LDFLAGS_NOLTO="-flto=thin"],[LDFLAGS_NOLTO="-flto"])
|
|
AC_SUBST(LLVM_AR)
|
|
- AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
|
|
+ AC_PATH_TOOL(LLVM_AR, ar, '', ${llvm_path})
|
|
AC_SUBST(LLVM_AR_FOUND)
|
|
if test -n "${LLVM_AR}" -a -x "${LLVM_AR}"
|
|
then
|
|
@@ -1956,7 +1957,7 @@ then
|
|
fi
|
|
LLVM_PROF_ERR=no
|
|
case $CC in
|
|
- *clang*)
|
|
+ *clang*|cc)
|
|
# Any changes made here should be reflected in the GCC+Darwin case below
|
|
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
|
|
PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
|
|
@@ -3876,11 +3877,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
|
|
dnl
|
|
found_tcltk=no
|
|
for _QUERY in \
|
|
- "tcl >= 8.5.12 tk >= 8.5.12" \
|
|
- "tcl8.6 tk8.6" \
|
|
"tcl86 tk86" \
|
|
- "tcl8.5 >= 8.5.12 tk8.5 >= 8.5.12" \
|
|
- "tcl85 >= 8.5.12 tk85 >= 8.5.12" \
|
|
; do
|
|
PKG_CHECK_EXISTS([$_QUERY], [
|
|
PKG_CHECK_MODULES([TCLTK], [$_QUERY], [found_tcltk=yes], [found_tcltk=no])
|