mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
tcl/tk, bump version, enable secondary architecture (#6912)
Fix detection for freetype Since we pretend to be regular tk, rename the library names in the config files
This commit is contained in:
Schrijvers Luc
GitHub
40
dev-lang/tcl/licenses/TCL
Normal file
40
dev-lang/tcl/licenses/TCL
Normal file
@@ -0,0 +1,40 @@
|
||||
This software is copyrighted by the Regents of the University of
|
||||
California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
|
||||
Corporation, Apple Inc. and other parties. The following terms apply to
|
||||
all files associated with the software unless explicitly disclaimed in
|
||||
individual files.
|
||||
|
||||
The authors hereby grant permission to use, copy, modify, distribute,
|
||||
and license this software and its documentation for any purpose, provided
|
||||
that existing copyright notices are retained in all copies and that this
|
||||
notice is included verbatim in any distributions. No written agreement,
|
||||
license, or royalty fee is required for any of the authorized uses.
|
||||
Modifications to this software may be copyrighted by their authors
|
||||
and need not follow the licensing terms described here, provided that
|
||||
the new terms are clearly indicated on the first page of each file where
|
||||
they apply.
|
||||
|
||||
IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
|
||||
FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
|
||||
ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
|
||||
DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
|
||||
IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
|
||||
NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
|
||||
MODIFICATIONS.
|
||||
|
||||
GOVERNMENT USE: If you are acquiring this software on behalf of the
|
||||
U.S. government, the Government shall have only "Restricted Rights"
|
||||
in the software and related documentation as defined in the Federal
|
||||
Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
|
||||
are acquiring the software on behalf of the Department of Defense, the
|
||||
software shall be classified as "Commercial Computer Software" and the
|
||||
Government shall have only "Restricted Rights" as defined in Clause
|
||||
252.227-7013 (b) (3) of DFARs. Notwithstanding the foregoing, the
|
||||
authors grant the U.S. Government and others acting in its behalf
|
||||
permission to use and distribute the software in accordance with the
|
||||
terms specified in this license.
|
||||
57
dev-lang/tcl/patches/tcl-8.6.12.patchset
Normal file
57
dev-lang/tcl/patches/tcl-8.6.12.patchset
Normal file
@@ -0,0 +1,57 @@
|
||||
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
|
||||
|
||||
107
dev-lang/tcl/tcl-8.6.12.recipe
Normal file
107
dev-lang/tcl/tcl-8.6.12.recipe
Normal file
@@ -0,0 +1,107 @@
|
||||
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="TCL"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://sourceforge.net/projects/tcl/files/Tcl/$portVersion/tcl$portVersion-src.tar.gz"
|
||||
CHECKSUM_SHA256="26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6"
|
||||
SOURCE_DIR="tcl$portVersion"
|
||||
PATCHES="tcl-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
commandBinDir=$binDir
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
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
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libsqlite3$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
tcl${secondaryArchSuffix}_devel = $portVersion compat >= 8.6
|
||||
devel:libtclstub8.6$secondaryArchSuffix = $portVersion compat >= 8.6
|
||||
"
|
||||
REQUIRES_devel="
|
||||
tcl$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libsqlite3$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:find
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:grep
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
defineDebugInfoPackage tcl$secondaryArchSuffix \
|
||||
"$libDir"/libtcl8.6.so
|
||||
|
||||
BUILD()
|
||||
{
|
||||
local _64bit="--enable-64bit"
|
||||
if [ "$targetArchitecture" = x86_gcc2 ]; then
|
||||
_64bit="--disable-64bit"
|
||||
fi
|
||||
|
||||
export CFLAGS="-USQLITE_API -USQLITE_EXTERN"
|
||||
cd unix
|
||||
autoconf -f
|
||||
runConfigure --omit-dirs binDit ./configure \
|
||||
--bindir=$commandBinDir \
|
||||
--enable-man-symlinks \
|
||||
--with-system-sqlite \
|
||||
$_64bit
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd unix
|
||||
make install install-private-headers
|
||||
|
||||
ln -s tclsh8.6 "${commandBinDir}/tclsh"
|
||||
|
||||
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
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
cd unix
|
||||
make test
|
||||
}
|
||||
Reference in New Issue
Block a user