From c28c49cd6fc9290e97aea6dd0376c51ffc9a760a Mon Sep 17 00:00:00 2001 From: klausz65 <61782506+klausz65@users.noreply.github.com> Date: Mon, 13 Mar 2023 19:17:53 +0100 Subject: [PATCH] tcl-sqlite: drop 32 bit support, fix pkgIndex.tcl --- components/tcl/tcl-sqlite/Makefile | 9 ++++----- .../tcl-sqlite/files/{pkgIndex.tcl => amd64.pkgIndex.tcl} | 0 .../files/{pkgIndex.tcl => sparcv9.pkgIndex.tcl} | 2 +- components/tcl/tcl-sqlite/manifests/sample-manifest.p5m | 9 ++++----- components/tcl/tcl-sqlite/pkg5 | 1 + .../{manifests/sample-manifest.p5m => tcl-sqlite.p5m} | 14 ++++++++------ 6 files changed, 18 insertions(+), 17 deletions(-) copy components/tcl/tcl-sqlite/files/{pkgIndex.tcl => amd64.pkgIndex.tcl} (100%) rename components/tcl/tcl-sqlite/files/{pkgIndex.tcl => sparcv9.pkgIndex.tcl} (79%) copy components/tcl/tcl-sqlite/{manifests/sample-manifest.p5m => tcl-sqlite.p5m} (66%) diff --git a/components/tcl/tcl-sqlite/Makefile b/components/tcl/tcl-sqlite/Makefile index 744a33f63c..eb8ee6d4c7 100644 --- a/components/tcl/tcl-sqlite/Makefile +++ b/components/tcl/tcl-sqlite/Makefile @@ -22,12 +22,11 @@ # Copyright (c) 2020 Michal Nowak # -BUILD_BITS= 32_and_64 - include ../../../make-rules/shared-macros.mk COMPONENT_NAME = tcl-sqlite COMPONENT_VERSION = 3.30.1 +COMPONENT_REVISIOn = 1 TARBALL_VERSION = 3300100 COMPONENT_SUMMARY = SQL database engine library - tcl files COMPONENT_SRC = sqlite-autoconf-$(TARBALL_VERSION) @@ -58,9 +57,9 @@ CFLAGS += -DSQLITE_ENABLE_STAT2 CONFIGURE_SCRIPT= $(SOURCE_DIR)/tea/configure CONFIGURE_OPTIONS += --enable-shared -CONFIGURE_OPTIONS.32 += --with-tcl="/usr/lib" -CONFIGURE_OPTIONS.64 += --with-tcl="/usr/lib/$(MACH64)" -CONFIGURE_OPTIONS.64 += LIBS="-m64" +CONFIGURE_OPTIONS += --enable-threads +CONFIGURE_OPTIONS += --enable-64bit +CONFIGURE_OPTIONS += --with-tcl="$(COMPONENT_DIR)/../tcl/build/$(MACH$(BITS))" # Auto-generated dependencies REQUIRED_PACKAGES += system/library diff --git a/components/tcl/tcl-sqlite/files/pkgIndex.tcl b/components/tcl/tcl-sqlite/files/amd64.pkgIndex.tcl similarity index 100% copy from components/tcl/tcl-sqlite/files/pkgIndex.tcl copy to components/tcl/tcl-sqlite/files/amd64.pkgIndex.tcl diff --git a/components/tcl/tcl-sqlite/files/pkgIndex.tcl b/components/tcl/tcl-sqlite/files/sparcv9.pkgIndex.tcl similarity index 79% rename from components/tcl/tcl-sqlite/files/pkgIndex.tcl rename to components/tcl/tcl-sqlite/files/sparcv9.pkgIndex.tcl index e44cf41231..63ac0ff56d 100644 --- a/components/tcl/tcl-sqlite/files/pkgIndex.tcl +++ b/components/tcl/tcl-sqlite/files/sparcv9.pkgIndex.tcl @@ -6,7 +6,7 @@ global tcl_platform if {$tcl_platform(wordSize) == 8} { package ifneeded sqlite3 3.30.1 \ - [list load [file join $dir amd64/libsqlite3.30.1.so] Sqlite3] + [list load [file join $dir sparcv9/libsqlite3.30.1.so] Sqlite3] } else { package ifneeded sqlite3 3.30.1 \ [list load [file join $dir libsqlite3.30.1.so] Sqlite3] diff --git a/components/tcl/tcl-sqlite/manifests/sample-manifest.p5m b/components/tcl/tcl-sqlite/manifests/sample-manifest.p5m index f1bd9bed23..5faa58231d 100644 --- a/components/tcl/tcl-sqlite/manifests/sample-manifest.p5m +++ b/components/tcl/tcl-sqlite/manifests/sample-manifest.p5m @@ -10,10 +10,11 @@ # # -# Copyright 2017 +# Copyright 2023 # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) @@ -22,8 +23,6 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -file path=usr/lib/$(MACH64)/sqlite$(COMPONENT_VERSION)/libsqlite$(COMPONENT_VERSION).so -file path=usr/lib/$(MACH64)/sqlite$(COMPONENT_VERSION)/pkgIndex.tcl -file path=usr/lib/sqlite$(COMPONENT_VERSION)/libsqlite$(COMPONENT_VERSION).so -file path=usr/lib/sqlite$(COMPONENT_VERSION)/pkgIndex.tcl +file path=usr/lib/$(MACH64)/sqlite$(HUMAN_VERSION)/libsqlite$(HUMAN_VERSION).so +file path=usr/lib/$(MACH64)/sqlite$(HUMAN_VERSION)/pkgIndex.tcl file path=usr/share/man/mann/sqlite3.n diff --git a/components/tcl/tcl-sqlite/pkg5 b/components/tcl/tcl-sqlite/pkg5 index c9520d02c9..370639669d 100644 --- a/components/tcl/tcl-sqlite/pkg5 +++ b/components/tcl/tcl-sqlite/pkg5 @@ -1,6 +1,7 @@ { "dependencies": [ "SUNWcs", + "shell/ksh93", "system/library" ], "fmris": [ diff --git a/components/tcl/tcl-sqlite/manifests/sample-manifest.p5m b/components/tcl/tcl-sqlite/tcl-sqlite.p5m similarity index 66% copy from components/tcl/tcl-sqlite/manifests/sample-manifest.p5m copy to components/tcl/tcl-sqlite/tcl-sqlite.p5m index f1bd9bed23..1051236cfd 100644 --- a/components/tcl/tcl-sqlite/manifests/sample-manifest.p5m +++ b/components/tcl/tcl-sqlite/tcl-sqlite.p5m @@ -10,10 +10,12 @@ # # -# Copyright 2017 +# Copyright 2017 Alexander Pyhalov +# Copyright 2023 Klaus Ziegler # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) @@ -22,8 +24,8 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -file path=usr/lib/$(MACH64)/sqlite$(COMPONENT_VERSION)/libsqlite$(COMPONENT_VERSION).so -file path=usr/lib/$(MACH64)/sqlite$(COMPONENT_VERSION)/pkgIndex.tcl -file path=usr/lib/sqlite$(COMPONENT_VERSION)/libsqlite$(COMPONENT_VERSION).so -file path=usr/lib/sqlite$(COMPONENT_VERSION)/pkgIndex.tcl -file path=usr/share/man/mann/sqlite3.n +file files/$(MACH64).pkgIndex.tcl path=usr/lib/sqlite$(HUMAN_VERSION)/pkgIndex.tcl +file usr/share/man/mann/sqlite3.n path=usr/share/man/man1t/sqlite3.1t + +file usr/lib/$(MACH64)/sqlite$(HUMAN_VERSION)/libsqlite$(HUMAN_VERSION).so \ + path=usr/lib/sqlite$(HUMAN_VERSION)/$(MACH64)/libsqlite$(HUMAN_VERSION).so -- 2.11.4.GIT