mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
53a5526dd9
* tcl: bump version to 8.6.14 Add gcc2 fixes to the new version, remove the old version 8.6.11 Move tclooConfig.sh to the devel package, similar to tclConfig.sh * tcl: fix test build with gcc2 * tcl: remove tclsh command from x86_gcc2 primary arch, in tcl_x86, move it back to $prefix/bin
144 lines
4.7 KiB
Plaintext
144 lines
4.7 KiB
Plaintext
From 97fdfc6275d51d7a935ac82bc4f1669c325aa475 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 11 Apr 2020 14:33:00 -0400
|
|
Subject: import patch from previous version
|
|
|
|
|
|
diff --git a/tests/env.test b/tests/env.test
|
|
index fb0674d..290cf88 100644
|
|
--- a/tests/env.test
|
|
+++ b/tests/env.test
|
|
@@ -101,7 +101,7 @@ variable keep {
|
|
TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY
|
|
SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH
|
|
DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING MSYSTEM
|
|
- __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM
|
|
+ __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH
|
|
CommonProgramFiles CommonProgramFiles(x86) ProgramFiles
|
|
ProgramFiles(x86) CommonProgramW6432 ProgramW6432
|
|
PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432 USERPROFILE
|
|
diff --git a/unix/tcl.m4 b/unix/tcl.m4
|
|
index 0307a06..250b64b 100644
|
|
--- a/unix/tcl.m4
|
|
+++ b/unix/tcl.m4
|
|
@@ -629,7 +629,13 @@ AC_DEFUN([SC_ENABLE_THREADS], [
|
|
# The space is needed
|
|
THREADS_LIBS=" -lpthread"
|
|
else
|
|
- AC_CHECK_LIB(pthreads, pthread_mutex_init,
|
|
+ AC_CHECK_LIB(root, pthread_mutex_init,
|
|
+ tcl_ok=yes, tcl_ok=no)
|
|
+ if test "$tcl_ok" = "yes"; then
|
|
+ # The space is needed
|
|
+ THREAD_LIBS=" "
|
|
+ else
|
|
+ AC_CHECK_LIB(pthreads, pthread_mutex_init,
|
|
tcl_ok=yes, tcl_ok=no)
|
|
if test "$tcl_ok" = "yes"; then
|
|
# The space is needed
|
|
@@ -648,6 +654,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
|
|
AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...])
|
|
fi
|
|
fi
|
|
+ fi
|
|
fi
|
|
fi
|
|
|
|
@@ -1237,6 +1244,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
|
|
SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS="-lroot"
|
|
+ LD_LIBRARY_PATH_VAR="LIBRARY_PATH"
|
|
AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"])
|
|
;;
|
|
HP-UX-*.11.*)
|
|
--
|
|
2.43.2
|
|
|
|
|
|
From 9478e718f25999a27ac5d111a6db2c73eb8fd5f6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Sat, 16 Mar 2024 18:41:16 +0100
|
|
Subject: gcc2 fixes
|
|
|
|
|
|
diff --git a/pkgs/sqlite3.44.2/generic/tclsqlite3.c b/pkgs/sqlite3.44.2/generic/tclsqlite3.c
|
|
index dd73fba..2e19b36 100644
|
|
--- a/pkgs/sqlite3.44.2/generic/tclsqlite3.c
|
|
+++ b/pkgs/sqlite3.44.2/generic/tclsqlite3.c
|
|
@@ -73,6 +73,7 @@
|
|
# endif
|
|
# endif /* SQLITE_PTRSIZE */
|
|
# if defined(HAVE_STDINT_H)
|
|
+# include <stdint.h>
|
|
typedef uintptr_t uptr;
|
|
# elif SQLITE_PTRSIZE==4
|
|
typedef unsigned int uptr;
|
|
diff --git a/pkgs/tdbcodbc1.1.7/generic/odbcStubInit.c b/pkgs/tdbcodbc1.1.7/generic/odbcStubInit.c
|
|
index a3aa4dc..b12d29b 100644
|
|
--- a/pkgs/tdbcodbc1.1.7/generic/odbcStubInit.c
|
|
+++ b/pkgs/tdbcodbc1.1.7/generic/odbcStubInit.c
|
|
@@ -144,13 +144,13 @@ OdbcInitStubs(Tcl_Interp* interp,
|
|
Tcl_Obj* shlibext; /* Extension to use for load modules */
|
|
Tcl_LoadHandle handle = NULL;
|
|
/* Handle to a load module */
|
|
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
+ int abiNum = 2;
|
|
+#endif
|
|
|
|
SQLConfigDataSourceW = NULL;
|
|
SQLConfigDataSource = NULL;
|
|
SQLInstallerError = NULL;
|
|
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
|
|
- int abiNum = 2;
|
|
-#endif
|
|
|
|
/*
|
|
* Determine the shared library extension
|
|
--
|
|
2.43.2
|
|
|
|
|
|
From 74e7683679a7ca9b3a447a4257b35436f89641cd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Sat, 16 Mar 2024 21:37:05 +0100
|
|
Subject: fix test build with gcc2
|
|
|
|
|
|
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
|
|
index a82f643..049ff12 100644
|
|
--- a/unix/dltest/Makefile.in
|
|
+++ b/unix/dltest/Makefile.in
|
|
@@ -17,7 +17,7 @@ TCL_VERSION= @TCL_VERSION@
|
|
|
|
CFLAGS_DEBUG = @CFLAGS_DEBUG@
|
|
CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
|
|
-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1 -Wall -Wextra -Wc++-compat -Wconversion -Werror
|
|
+CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_NO_DEPRECATED=1 -Wall -Wconversion -Werror
|
|
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
|
|
LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
|
|
LDFLAGS = @LDFLAGS_DEFAULT@ @LDFLAGS@
|
|
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
|
|
index 75d1eac..620cd74 100644
|
|
--- a/unix/dltest/pkgb.c
|
|
+++ b/unix/dltest/pkgb.c
|
|
@@ -101,12 +101,13 @@ Pkgb_DemoObjCmd(
|
|
int objc, /* Number of arguments. */
|
|
Tcl_Obj *const objv[]) /* Argument objects. */
|
|
{
|
|
+#if (TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 4)
|
|
+ Tcl_Obj *first;
|
|
+#endif
|
|
(void)dummy;
|
|
(void)objc;
|
|
(void)objv;
|
|
#if (TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 4)
|
|
- Tcl_Obj *first;
|
|
-
|
|
if (Tcl_ListObjIndex(NULL, Tcl_GetEncodingSearchPath(), 0, &first)
|
|
== TCL_OK) {
|
|
Tcl_SetObjResult(interp, first);
|
|
--
|
|
2.43.2
|
|
|