tcl: drop 32 bit add SPARC vis instruction option

klausz65

2023-03-13 2dc34e1c809142e37fbf0770d28ace07bda7a35b

tcl: drop 32 bit add SPARC vis instruction option

 components/tcl/tcl/Makefile

@@ -22,14 +22,15 @@
#
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2020, Michal Nowak
# Copyright (c) 2023, Klaus Ziegler
#

BUILD_BITS= 32_and_64
USE_COMMON_TEST_MASTER= no
USE_COMMON_TEST_MASTER= yes
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=         tcl
COMPONENT_VERSION=      8.6.13
COMPONENT_REVISION=     1
COMPONENT_MINOR_VERSION= $(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.\([0-9]\+\)\.[0-9]\+/\1.\2/')
COMPONENT_SUMMARY=        Tcl - portable scripting environment
COMPONENT_DESCRIPTION=    Tcl is a dynamic programming language used in web and desktop applications, networking, administration, testing and many more applications
@@ -58,24 +59,28 @@

CONFIGURE_SCRIPT = $(SOURCE_DIR)/unix/configure

CONFIGURE_BINDIR.32 =  $(CONFIGURE_PREFIX)/bin/$(MACH32)

CONFIGURE_OPTIONS    += --enable-shared
CONFIGURE_OPTIONS    += --enable-man-symlinks
CONFIGURE_OPTIONS    += --enable-threads
CONFIGURE_OPTIONS.64    += --enable-64bit
CONFIGURE_OPTIONS    += --enable-64bit
ifeq ($(strip $(MACH)),sparc)
CONFIGURE_OPTIONS    += --enable-64bit-vis
endif

install:    $(INSTALL_32_and_64) $(PROTOUSRLIBDIR)/tclConfig.sh
install:    $(INSTALL_64) $(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh

$(PROTOUSRLIBDIR)/tclConfig.sh:        $(INSTALL_32)
                    sed -f $(COMPONENT_DIR)/files/tclsed $(PROTOUSRLIBDIR)/tclConfig.sh > \
                        $(PROTOUSRLIBDIR)/tclConfig.sh.new
                    $(MV) $(PROTOUSRLIBDIR)/tclConfig.sh.new $(PROTOUSRLIBDIR)/tclConfig.sh
                    $(CHMOD) 555 $(PROTOUSRLIBDIR)/tclConfig.sh
$(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh:    $(INSTALL_64)
    sed -f $(COMPONENT_DIR)/files/tclsed $(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh > \
        $(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh.new
    $(MV) $(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh.new $(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh
    $(CHMOD) 555 $(PROTOUSRLIBDIR)/$(MACH64)/tclConfig.sh

# if test does not run the first, try second time, then it
# will show no diffs - some kind of a ping pong play.
COMPONENT_TEST_TARGETS= test
COMPONENT_TEST_TRANSFORMS= \
    '-n' \
    '-e "/^LD_LIBRARY_PATH/d"' \
    '-e "/all\.tcl/p"' \
    '-e "/Files/p"'


 components/tcl/tcl/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2022 <contributor>
# Copyright 2023 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,8 +23,7 @@

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/$(MACH32)/tclsh8.6
file path=usr/bin/$(MACH64)/tclsh8.6
file path=usr/bin/tclsh8.6
file path=usr/include/tcl.h
file path=usr/include/tclDecls.h
file path=usr/include/tclOO.h
@@ -37,9 +36,6 @@
file path=usr/lib/$(MACH64)/pkgconfig/tcl.pc
file path=usr/lib/$(MACH64)/tclConfig.sh
file path=usr/lib/$(MACH64)/tclooConfig.sh
file path=usr/lib/libtcl8.6.so
file path=usr/lib/libtclstub8.6.a
file path=usr/lib/pkgconfig/tcl.pc
file path=usr/lib/tcl8.6/auto.tcl
file path=usr/lib/tcl8.6/clock.tcl
file path=usr/lib/tcl8.6/encoding/ascii.enc
@@ -267,8 +263,6 @@
file path=usr/lib/tcl8/8.5/msgcat-1.6.1.tm
file path=usr/lib/tcl8/8.5/tcltest-2.5.5.tm
file path=usr/lib/tcl8/8.6/http-2.9.8.tm
file path=usr/lib/tclConfig.sh
file path=usr/lib/tclooConfig.sh
file path=usr/share/man/man1/tclsh.1
file path=usr/share/man/man1t/Tcl.1t
file path=usr/share/man/man1t/after.1t

 components/tcl/tcl/tcl.p5m

@@ -27,13 +27,8 @@

file files/libtcl.3 path=usr/share/man/man3/libtcl.3

file path=usr/bin/$(MACH32)/tclsh$(COMPONENT_MINOR_VERSION)
file path=usr/bin/$(MACH64)/tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/$(MACH32)/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/$(MACH64)/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/tclsh target=tclsh$(COMPONENT_MINOR_VERSION)
link path=usr/bin/tclsh$(COMPONENT_MINOR_VERSION) \
    target=$(MACH64)/tclsh$(COMPONENT_MINOR_VERSION)
file path=usr/bin/tclsh$(COMPONENT_MINOR_VERSION)

file path=usr/include/tcl.h
file path=usr/include/tclDecls.h
@@ -42,14 +37,14 @@
file path=usr/include/tclPlatDecls.h
file path=usr/include/tclTomMath.h
file path=usr/include/tclTomMathDecls.h
# provide symlinks to ease transition.
link path=usr/lib/tclConfig.sh target=$(MACH64)/tclConfig.sh
link path=usr/lib/tclooConfig.s target=$(MACH64)/tclooConfig.sh
file path=usr/lib/$(MACH64)/libtcl$(COMPONENT_MINOR_VERSION).so
file path=usr/lib/$(MACH64)/libtclstub$(COMPONENT_MINOR_VERSION).a
file path=usr/lib/$(MACH64)/pkgconfig/tcl.pc
file path=usr/lib/$(MACH64)/tclConfig.sh mode=0555
file path=usr/lib/$(MACH64)/tclooConfig.sh mode=0555
file path=usr/lib/libtcl$(COMPONENT_MINOR_VERSION).so
file path=usr/lib/libtclstub$(COMPONENT_MINOR_VERSION).a
file path=usr/lib/pkgconfig/tcl.pc
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/auto.tcl
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/clock.tcl
file path=usr/lib/tcl$(COMPONENT_MINOR_VERSION)/encoding/ascii.enc
@@ -277,8 +272,6 @@
file path=usr/lib/tcl8/8.5/msgcat-1.6.1.tm
file path=usr/lib/tcl8/8.5/tcltest-2.5.5.tm
file path=usr/lib/tcl8/8.6/http-2.9.8.tm
file path=usr/lib/tclConfig.sh mode=0555
file path=usr/lib/tclooConfig.sh mode=0555
file path=usr/share/man/man1/tclsh.1
file path=usr/share/man/man1t/Tcl.1t
file path=usr/share/man/man1t/after.1t

 components/tcl/tcl/test/results-32.master

File was deleted

 components/tcl/tcl/test/results-64.master

File was deleted

 components/tcl/tcl/test/results-all.master

New file
@@ -0,0 +1,4 @@
all.tcl:    Total    34591    Passed    31207    Skipped    3370    Failed    14
Sourced 151 Test Files.
Files with failing tests: cmdAH.test http.test socket.test
    5    notNetworkFilesystem