mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
tcl: bump version to 8.6.14 (#10226)
* 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
This commit is contained in:
Joachim Mairböck
GitHub
@@ -1,57 +0,0 @@
|
||||
From f1281718cfb8a9e92bcc3d03961424043f281735 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 036c7a2..ab8fe59 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 ProgramFiles CommonProgramW6432 ProgramW6432
|
||||
}
|
||||
|
||||
diff --git a/unix/tcl.m4 b/unix/tcl.m4
|
||||
index 27b7540..1091ee0 100644
|
||||
--- a/unix/tcl.m4
|
||||
+++ b/unix/tcl.m4
|
||||
@@ -628,7 +628,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
|
||||
@@ -647,6 +653,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
|
||||
|
||||
@@ -1238,6 +1245,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.30.0
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
From bdc9c01ab8290a624bf326fbf70731f8ec0eb012 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 bc1d7e9..d91cfbf 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 ca94abd..eae2f72 100644
|
||||
--- a/unix/tcl.m4
|
||||
+++ b/unix/tcl.m4
|
||||
@@ -630,7 +630,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
|
||||
@@ -649,6 +655,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
|
||||
|
||||
@@ -1241,6 +1248,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.37.3
|
||||
|
||||
143
dev-lang/tcl/patches/tcl-8.6.14.patchset
Normal file
143
dev-lang/tcl/patches/tcl-8.6.14.patchset
Normal file
@@ -0,0 +1,143 @@
|
||||
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
|
||||
|
||||
@@ -1,89 +0,0 @@
|
||||
SUMMARY="A very powerful but easy to learn dynamic programming language"
|
||||
DESCRIPTION="
|
||||
Tcl (Tool Command Language) is a very powerful but easy to learn dynamic \
|
||||
programming language, suitable for a very wide range of uses, including web \
|
||||
and desktop applications, networking, administration, testing and many more. \
|
||||
Open source and business-friendly, Tcl is a mature yet evolving language that \
|
||||
is truly cross platform, easily deployed and highly extensible."
|
||||
HOMEPAGE="http://www.tcl.tk"
|
||||
COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, and other parties"
|
||||
LICENSE="BSD (2-clause)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://sourceforge.net/projects/tcl/files/Tcl/$portVersion/tcl$portVersion-src.tar.gz"
|
||||
CHECKSUM_SHA256="8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258"
|
||||
SOURCE_DIR="tcl$portVersion"
|
||||
PATCHES="tcl-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
|
||||
PROVIDES="
|
||||
tcl = $portVersion compat >= 8.6
|
||||
cmd:tclsh = $portVersion compat >= 8.6
|
||||
cmd:tclsh8.6 = $portVersion compat >= 8.6
|
||||
lib:libtcl8.6 = $portVersion compat >= 8.6
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
lib:libsqlite3
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
tcl_devel = $portVersion
|
||||
devel:libtclstub8.6 = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
tcl == $portVersion
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
devel:libsqlite3
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:autoconf
|
||||
cmd:find
|
||||
cmd:gcc
|
||||
cmd:grep
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
defineDebugInfoPackage tcl \
|
||||
"$libDir"/libtcl8.6.so
|
||||
|
||||
BUILD()
|
||||
{
|
||||
export CFLAGS="-USQLITE_API -USQLITE_EXTERN"
|
||||
cd unix
|
||||
autoconf -f
|
||||
runConfigure ./configure \
|
||||
--enable-man-symlinks \
|
||||
--with-system-sqlite
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd unix
|
||||
make install install-private-headers
|
||||
|
||||
ln -s tclsh8.6 "${binDir}/tclsh"
|
||||
|
||||
sed -i -e "s#${sourceDir}/unix#${developLibDir}#" \
|
||||
-e "s#${sourceDir}#${includeDir}#" \
|
||||
${libDir}/tclConfig.sh
|
||||
|
||||
rm $binDir/sqlite3_analyzer
|
||||
|
||||
prepareInstalledDevelLibs libtclstub8.6
|
||||
fixPkgconfig
|
||||
mv $libDir/tclConfig.sh $developLibDir
|
||||
packageEntries devel $developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd unix
|
||||
make test
|
||||
}
|
||||
@@ -9,11 +9,11 @@ COPYRIGHT="Regents of the University of California, Sun Microsystems, Inc., Scri
|
||||
LICENSE="TCL"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://sourceforge.net/projects/tcl/files/Tcl/$portVersion/tcl$portVersion-src.tar.gz"
|
||||
CHECKSUM_SHA256="43a1fae7412f61ff11de2cfd05d28cfc3a73762f354a417c62370a54e2caf066"
|
||||
CHECKSUM_SHA256="5880225babf7954c58d4fb0f5cf6279104ce1cd6aa9b71e9a6322540e1c4de66"
|
||||
SOURCE_DIR="tcl$portVersion"
|
||||
PATCHES="tcl-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
ARCHITECTURES="all"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
commandBinDir=$binDir
|
||||
@@ -25,10 +25,15 @@ fi
|
||||
|
||||
PROVIDES="
|
||||
tcl$secondaryArchSuffix = $portVersion compat >= 8.6
|
||||
cmd:tclsh$commandSuffix = $portVersion compat >= 8.6
|
||||
cmd:tclsh8.6$commandSuffix = $portVersion compat >= 8.6
|
||||
lib:libtcl8.6$secondaryArchSuffix = $portVersion compat >= 8.6
|
||||
"
|
||||
if [ "$targetArchitecture" != "x86_gcc2" -o -n "$secondaryArchSuffix" ]; then
|
||||
# don't provide commands for x86_gcc2, they are provided by tcl_x86 instead
|
||||
PROVIDES+="
|
||||
cmd:tclsh$commandSuffix = $portVersion compat >= 8.6
|
||||
cmd:tclsh8.6$commandSuffix = $portVersion compat >= 8.6
|
||||
"
|
||||
fi
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
@@ -63,10 +68,12 @@ defineDebugInfoPackage tcl$secondaryArchSuffix \
|
||||
|
||||
BUILD()
|
||||
{
|
||||
local _64bit="--enable-64bit"
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
_64bit="--disable-64bit"
|
||||
fi
|
||||
local _64bit="--disable-64bit"
|
||||
case "$targetArchitecture" in
|
||||
*64*)
|
||||
_64bit="--enable-64bit"
|
||||
;;
|
||||
esac
|
||||
|
||||
export CFLAGS="-USQLITE_API -USQLITE_EXTERN"
|
||||
cd unix
|
||||
@@ -84,18 +91,20 @@ INSTALL()
|
||||
cd unix
|
||||
make install install-private-headers
|
||||
|
||||
ln -s tclsh8.6 "${commandBinDir}/tclsh"
|
||||
if [ "$targetArchitecture" != "x86_gcc2" -o -n "$secondaryArchSuffix" ]; then
|
||||
ln -s tclsh8.6 "${commandBinDir}/tclsh"
|
||||
rm $commandBinDir/sqlite3_analyzer
|
||||
else
|
||||
rm -r $commandBinDir $manDir/man1
|
||||
fi
|
||||
|
||||
sed -i -e "s#${sourceDir}/unix#${developLibDir}#" \
|
||||
-e "s#${sourceDir}#${includeDir}#" \
|
||||
${libDir}/tclConfig.sh
|
||||
|
||||
rm $commandBinDir/sqlite3_analyzer
|
||||
|
||||
prepareInstalledDevelLib libtclstub8.6
|
||||
fixPkgconfig
|
||||
|
||||
mv $libDir/tclConfig.sh $developLibDir
|
||||
mv $libDir/tclConfig.sh $libDir/tclooConfig.sh $developLibDir
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
Reference in New Issue
Block a user