diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..9b7c16d48bd159875d83e4763fc63b46ce1bd58f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.bz2 filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..2558a3763968a7da60f4a9c538feb827c23807b5 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/firebird diff --git a/0001-Port-to-RISC-V-64-bit-riscv64.patch b/0001-Port-to-RISC-V-64-bit-riscv64.patch index 6fcc1fc644ef34d01d803c617430543d069007b9..482737c44b74668690eff0e9569975f15a54c613 100644 --- a/0001-Port-to-RISC-V-64-bit-riscv64.patch +++ b/0001-Port-to-RISC-V-64-bit-riscv64.patch @@ -47,7 +47,7 @@ diff -urN Firebird-3.0.3.32900-0.old/configure.ac Firebird-3.0.3.32900-0/configu + libdir=/usr/lib64 + ;; + - powerpc64le-*-linux*) + powerpc64le-*-linux*) MAKEFILE_PREFIX=linux_powerpc64el INSTALL_PREFIX=linux diff -urN Firebird-3.0.3.32900-0.old/src/common/classes/DbImplementation.cpp Firebird-3.0.3.32900-0/src/common/classes/DbImplementation.cpp @@ -110,8 +110,8 @@ diff -urN Firebird-3.0.3.32900-0.old/src/common/common.h Firebird-3.0.3.32900-0/ --- Firebird-3.0.3.32900-0.old/src/common/common.h 2018-03-19 08:56:23.377156741 +0000 +++ Firebird-3.0.3.32900-0/src/common/common.h 2018-03-19 08:56:57.255118154 +0000 @@ -135,6 +135,10 @@ - #define FB_CPU CpuArm64 - #endif /* ARM64 */ + #define FB_CPU CpuArm + #endif /* ARM */ +#ifdef RISCV64 +#define FB_CPU CpuRiscV64 diff --git a/0001-add-loongarch64-support-for-Firebird.patch b/0001-add-loongarch64-support-for-Firebird.patch new file mode 100644 index 0000000000000000000000000000000000000000..e4383ea85a4b8c15baaff364d7bc4acc42bce917 --- /dev/null +++ b/0001-add-loongarch64-support-for-Firebird.patch @@ -0,0 +1,112 @@ +From 10745ac134b19ee035fc4b9836325b9b743d1890 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Sat, 20 May 2023 02:26:48 +0000 +Subject: [PATCH] add loongarch64 support for Firebird + +--- + builds/posix/prefix.linux_loongarch64 | 7 +++++++ + configure.ac | 12 ++++++++++++ + src/common/classes/DbImplementation.cpp | 7 ++++--- + src/common/common.h | 4 ++++ + src/jrd/inf_pub.h | 1 + + 5 files changed, 28 insertions(+), 3 deletions(-) + create mode 100644 builds/posix/prefix.linux_loongarch64 + +diff --git a/builds/posix/prefix.linux_loongarch64 b/builds/posix/prefix.linux_loongarch64 +new file mode 100644 +index 0000000..70532a6 +--- /dev/null ++++ b/builds/posix/prefix.linux_loongarch64 +@@ -0,0 +1,7 @@ ++WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -Wno-invalid-offsetof -Wno-narrowing -Wno-unused-local-typedefs ++ ++PROD_FLAGS=-O3 -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -fsigned-char -fmessage-length=0 ++DEV_FLAGS=-ggdb -DLINUX -DRISCV64 -pipe -p -MMD -fPIC -Wall -fsigned-char -fmessage-length=0 $(WARN_FLAGS) ++ ++CXXFLAGS := $(CXXFLAGS) -std=c++11 ++ +diff --git a/configure.ac b/configure.ac +index cdc9c3e..c6186fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -262,6 +262,18 @@ dnl CPU_TYPE=ppc64 + STD_ICU=true + libdir=/usr/lib64 + ;; ++ ++ loongarch64*-*-linux*) ++ MAKEFILE_PREFIX=linux_loongarch64 ++ INSTALL_PREFIX=linux ++ PLATFORM=LINUX ++ AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) ++ EDITLINE_FLG=Y ++ SHRLIB_EXT=so ++ STD_EDITLINE=true ++ STD_ICU=true ++ libdir=/usr/lib64 ++ ;; + + powerpc64le-*-linux*) + MAKEFILE_PREFIX=linux_powerpc64el +diff --git a/src/common/classes/DbImplementation.cpp b/src/common/classes/DbImplementation.cpp +index 7376b9b..fb68145 100644 +--- a/src/common/classes/DbImplementation.cpp ++++ b/src/common/classes/DbImplementation.cpp +@@ -91,7 +91,8 @@ const char* hardware[] = { + "ARM64", + "PowerPC64el", + "M68k", +- "RiscV64" ++ "RiscV64", ++ "LoongArch64" + }; + + const char* operatingSystem[] = { +@@ -118,7 +119,7 @@ const char* compiler[] = { + // This table lists pre-fb3 implementation codes + const UCHAR backwardTable[FB_NELEM(hardware) * FB_NELEM(operatingSystem)] = + { +-// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el RiscV64 ++// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el RiscV64 LoongArch64 + /* Windows */ 50, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + /* Linux */ 60, 66, 65, 69, 86, 71, 72, 75, 76, 79, 78, 80, 81, 82, 83, 84, 85, 88, + /* Darwin */ 70, 73, 0, 63, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +@@ -132,7 +133,7 @@ const UCHAR backwardTable[FB_NELEM(hardware) * FB_NELEM(operatingSystem)] = + + const UCHAR backEndianess[FB_NELEM(hardware)] = + { +-// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el M68k RiscV64 ++// Intel AMD Sparc PPC PPC64 MIPSEL MIPS ARM IA64 s390 s390x SH SHEB HPPA Alpha ARM64 PowerPC64el M68k RiscV64 LoongArch64 + 0, 0, 1, 1, 1, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, + }; + +diff --git a/src/common/common.h b/src/common/common.h +index cf9fbe4..f7ead78 100644 +--- a/src/common/common.h ++++ b/src/common/common.h +@@ -139,6 +139,10 @@ + #define FB_CPU CpuRiscV64 + #endif /* RISCV64 */ + ++#ifdef LOONGARCH64 ++#define FB_CPU CpuLoongArch64 ++#endif /* LOONGARCH64 */ ++ + #ifdef sparc + #define FB_CPU CpuUltraSparc + #define RISC_ALIGNMENT +diff --git a/src/jrd/inf_pub.h b/src/jrd/inf_pub.h +index 04a4061..7aa8693 100644 +--- a/src/jrd/inf_pub.h ++++ b/src/jrd/inf_pub.h +@@ -248,6 +248,7 @@ enum info_db_implementations + isc_info_db_impl_linux_ppc64 = 86, + isc_info_db_impl_linux_m68k = 87, + isc_info_db_impl_linux_riscv64 = 88, ++ isc_info_db_impl_linux_loongarch64 = 89, + + isc_info_db_impl_last_value // Leave this LAST! + }; +-- +2.33.0 + diff --git a/Firebird-3.0.13.33818-0.tar.bz2 b/Firebird-3.0.13.33818-0.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..7de158f52297bb0470c979e70d3b5de73e2462bb --- /dev/null +++ b/Firebird-3.0.13.33818-0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd263c4f685fb8fc3f1dcb8be8a411033cc31c5404d1dfce5d3849aa3f63a64d +size 13343760 diff --git a/Firebird-3.0.3.32900-0.tar.bz2 b/Firebird-3.0.3.32900-0.tar.bz2 deleted file mode 100644 index 83ab42177723c4a1a1d781980563b4f6a0d7cb85..0000000000000000000000000000000000000000 Binary files a/Firebird-3.0.3.32900-0.tar.bz2 and /dev/null differ diff --git a/Fix-connect-linking-to-web-database-by-modifying-the-default-conf.patch b/Fix-connect-linking-to-web-database-by-modifying-the-default-conf.patch index 9b931ba6d48adb598a737f8f36286f4784f67336..53305884198476473426601176ba24baf1c47767 100644 --- a/Fix-connect-linking-to-web-database-by-modifying-the-default-conf.patch +++ b/Fix-connect-linking-to-web-database-by-modifying-the-default-conf.patch @@ -2,7 +2,7 @@ diff --git a/builds/install/misc/firebird.conf.in b/builds/install/misc/firebird index 05cd0c7..8c3d9ef 100644 --- a/builds/install/misc/firebird.conf.in +++ b/builds/install/misc/firebird.conf.in -@@ -406,10 +406,12 @@ +@@ -415,11 +415,13 @@ # Per-database configurable. # #AuthServer = Srp @@ -10,12 +10,13 @@ index 05cd0c7..8c3d9ef 100644 # # Per-connection and per-database configurable. # - #AuthClient = Srp, Win_Sspi, Legacy_Auth + #AuthClient = Srp, Srp256, Legacy_Auth #Non Windows clients + #AuthClient = Srp, Srp256, Win_Sspi, Legacy_Auth #Windows clients +AuthClient = Legacy_Auth # # If you need to use server plugins that do not provide encryption key (both Legacy_Auth # & Win_Sspi) you should also turn off required encryption on the wire with WireCrypt -@@ -600,6 +602,7 @@ +@@ -631,6 +633,7 @@ # Type: string (predefined values) # #WireCrypt = Enabled (for client) / Required (for server) diff --git a/Provide-sized-global-delete-operators-when-compiled.patch b/Provide-sized-global-delete-operators-when-compiled.patch index 1302d1dafe7b1134651593add53e4ed71c0f147e..91a308ecd265043e94fb59b7fc3485f302046eef 100644 --- a/Provide-sized-global-delete-operators-when-compiled.patch +++ b/Provide-sized-global-delete-operators-when-compiled.patch @@ -27,9 +27,9 @@ index b1026ce2aac4..fda5bfebb0cc 100644 + MemoryPool::globalFree(mem); +} +#endif - #ifdef DEBUG_GDS_ALLOC - - #ifdef __clang__ + #if _MSC_VER >= 1900 + #pragma warning(pop) + #endif -- 2.8.2 diff --git a/a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch b/a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch deleted file mode 100644 index 196c6daed33de6996d8f02e88c90e8482a9322f0..0000000000000000000000000000000000000000 --- a/a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab Mon Sep 17 00:00:00 2001 -From: AlexPeshkoff -Date: Sat, 10 Feb 2018 19:43:26 +0300 -Subject: [PATCH] Make it build with icu60 - ---- - src/common/common.h | 3 +++ - src/common/unicode_util.h | 4 ++++ - src/intl/cs_icu.cpp | 1 - - src/intl/cv_icu.cpp | 1 - - 4 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/common/common.h b/src/common/common.h -index 2cf877a804..58abaaf695 100644 ---- a/src/common/common.h -+++ b/src/common/common.h -@@ -997,4 +997,7 @@ namespace Firebird { - static IMessageMetadata* const DELAYED_OUT_FORMAT = reinterpret_cast(1); - } - -+#undef UCHAR_TYPE -+#define UCHAR_TYPE uint16_t -+ - #endif /* COMMON_COMMON_H */ -diff --git a/src/common/unicode_util.h b/src/common/unicode_util.h -index 001d3d8283..03d48f9419 100644 ---- a/src/common/unicode_util.h -+++ b/src/common/unicode_util.h -@@ -31,6 +31,10 @@ - #include "../common/IntlUtil.h" - #include "../common/os/mod_loader.h" - #include "../common/classes/fb_string.h" -+ -+#undef U_SHOW_CPLUSPLUS_API -+#define U_SHOW_CPLUSPLUS_API 0 -+ - #include - - struct UCollator; -diff --git a/src/intl/cs_icu.cpp b/src/intl/cs_icu.cpp -index 76f15a2e68..bc3b48b44f 100644 ---- a/src/intl/cs_icu.cpp -+++ b/src/intl/cs_icu.cpp -@@ -28,7 +28,6 @@ - #include "../intl/ldcommon.h" - #include "cs_icu.h" - #include "cv_icu.h" --#include - #include "../common/unicode_util.h" - - -diff --git a/src/intl/cv_icu.cpp b/src/intl/cv_icu.cpp -index b1ac01fce5..82262d9b4d 100644 ---- a/src/intl/cv_icu.cpp -+++ b/src/intl/cv_icu.cpp -@@ -28,7 +28,6 @@ - #include "../intl/ldcommon.h" - #include "ld_proto.h" - #include "cv_icu.h" --#include - #include "../common/unicode_util.h" - - diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch index 1f556e0fcb908d35f60326e0c4674a3f932827ac..735e3b91b280b8351194df2e1d7590503373bfc5 100644 --- a/cloop-honour-build-flags.patch +++ b/cloop-honour-build-flags.patch @@ -6,8 +6,8 @@ Forwarded: no +++ b/extern/cloop/Makefile @@ -6,7 +6,7 @@ TARGET := release - CC := gcc - CXX := g++ + CC := $(CC) + CXX := $(CXX) -LD := $(CXX) +LD := $(CXX) $(LDFLAGS) diff --git a/firebird.spec b/firebird.spec index b0188f7e12e9164d7861fdf29b46e40f3f1caeb2..8b640afd206659b95e10f90736a8fe45ba551b84 100644 --- a/firebird.spec +++ b/firebird.spec @@ -1,11 +1,14 @@ +%global ver 3.0.13 +%global rev 33818 + Name: firebird -Version: 3.0.3.32900 -Release: 9 +Version: %{ver}.%{rev} +Release: 1 Summary: SQL relational database management system License: Interbase-1.0 URL: http://www.firebirdsql.org/ -Source0: https://github.com/FirebirdSQL/firebird/releases/download/R3_0_3/Firebird-3.0.3.32900-0.tar.bz2 +Source0: https://github.com/FirebirdSQL/firebird/releases/download/v%{ver}/Firebird-%{ver}.%{rev}-0.tar.bz2 Source1: firebird-logrotate Source2: firebird.conf Source3: fb_config @@ -16,12 +19,13 @@ Patch0002: obsolete-syslogd.target.patch Patch0003: honour-buildflags.patch Patch0004: no-copy-from-icu.patch Patch0005: cloop-honour-build-flags.patch -Patch0006: a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch +Patch0006: Fix-connect-linking-to-web-database-by-modifying-the-default-conf.patch Patch0007: 0001-Port-to-RISC-V-64-bit-riscv64.patch -Patch0008: Fix-connect-linking-to-web-database-by-modifying-the-default-conf.patch +Patch0008: 0001-add-loongarch64-support-for-Firebird.patch BuildRequires: autoconf automake libtommath-devel libtool ncurses-devel libicu-devel BuildRequires: libedit-devel gcc-c++ libstdc++-static systemd-units chrpath zlib-devel procmail +BuildRequires: chrpath Requires(post): systemd-units Requires(preun):systemd-units @@ -64,7 +68,7 @@ Obsoletes: firebird-doc < %{version}-%{release} Documentation for Firebird SQL server. %prep -%autosetup -n Firebird-3.0.3.32900-0 -p1 +%autosetup -n Firebird-%{ver}.%{rev}-0 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -85,6 +89,7 @@ cd gen make -f Makefile.install buildRoot chmod -R u+w buildroot%{_docdir}/firebird + %install chmod u+rw,a+rx gen/buildroot/usr/include/firebird/firebird/impl cp -r gen/buildroot/* ${RPM_BUILD_ROOT}/ @@ -93,7 +98,7 @@ cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/ cd ${RPM_BUILD_ROOT} rm -vf .%{_sbindir}/*.sh && mv -v .%{_sbindir}/fb_config .%{_libdir}/ -install -pm 0755 %{SOURCE2} %{buildroot}%{_sbindir}/fb_config +install -pm 0755 %{SOURCE3} %{buildroot}%{_sbindir}/fb_config rm -vf .%{_includedir}/firebird/perf.h .%{_includedir}/*.h .%{_libdir}/libicu*.so chmod -R u+w .%{_docdir}/firebird rm -vf .%{_datadir}/firebird/misc/{firebird.init.*,firebird.xinetd,rc.config.firebird} @@ -110,6 +115,20 @@ install -d .%{_tmpfilesdir} && cp %{SOURCE2} .%{_tmpfilesdir}/ install -d .%{_unitdir} cp .%{_datadir}/firebird/misc/firebird-superserver.service .%{_unitdir}/firebird-superserver.service +# remove rpath info +for ff in $(find %{buildroot}/ -executable -type f -exec file '{}' ';' | grep "\" | awk -F ':' '{print $1}') +do + if [ ! -u "$ff" ]; then + if [ -w "$ff" ]; then + chrpath -d $ff + fi + fi +done + +# add rpath path /usr/lib/systemd in ld.so.cond.d +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "/usr/lib/systemd" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf + %pre @@ -124,11 +143,13 @@ fi %post +/sbin/ldconfig systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf %systemd_post firebird-superserver.service %postun +/sbin/ldconfig %systemd_postun_with_restart firebird-superserver.service @@ -162,6 +183,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf %dir %{_localstatedir}/log/firebird %config(noreplace) %attr(0664,firebird,firebird) %{_localstatedir}/log/firebird/firebird.log %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/firebird +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %defattr(0755,root,root,0755) %{_unitdir}/firebird-superserver.service @@ -185,6 +207,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf %exclude %{_docdir}/firebird/IPLicense.txt %changelog +* Tue Jul 15 2025 Funda Wang - 3.0.13.33818-1 +- update to 3.0.13 + * Mon Nov 22 2021 xu_ping - 3.0.3.32900-9 - Fix connect linking to web database by modifying the firebird.conf items to make client and server compatible @@ -202,4 +227,3 @@ systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf * Mon Dec 2 2019 lihao - 3.0.3.32900-5 - Package Init - diff --git a/firebird.yaml b/firebird.yaml new file mode 100644 index 0000000000000000000000000000000000000000..729119578573217fb71c67778fef3abcfc63ef6d --- /dev/null +++ b/firebird.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: FirebirdSQL/firebird +tag_prefix: ^v +seperator: . diff --git a/honour-buildflags.patch b/honour-buildflags.patch index fb3487b49d5aae3e1e659a6b5020ff58211b167b..14016efdba859e62c93f3120cbe218f95bc4fc19 100644 --- a/honour-buildflags.patch +++ b/honour-buildflags.patch @@ -13,7 +13,7 @@ Author: Damyan Ivanov $(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles) - $(STATICEXE_LINK) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src) -+ $(STATICEXE_LINK) $(EXE_LINK_OPTIONS) $(LINK_OPTS) $(CPPFLAGS) -o $(MAKE_HEADER_Bin) $(MAKE_HEADER_Src) ++ $(STATICEXE_LINK) $(EXE_LINK_OPTIONS) $(LINK_OPTS) $(CPPFLAGS) -o $(MAKE_HEADER_Bin) -fPIE $(MAKE_HEADER_Src) $(CP) $^ . $(MAKE_HEADER_Bin) $@ $(RM) -f ibase.h diff --git a/no-copy-from-icu.patch b/no-copy-from-icu.patch index 2155d2df8c95f5422950c18cd7d1d1e7447ad0cd..2618242a9ea20ef7c84deffb4ad14390462a3743 100644 --- a/no-copy-from-icu.patch +++ b/no-copy-from-icu.patch @@ -1,43 +1,6 @@ Description: Link isql with ICU instead of embedding part of it in the source Author: Damyan Ivanov ---- a/src/isql/isql.epp -+++ b/src/isql/isql.epp -@@ -173,34 +173,6 @@ const char* UNKNOWN = "*unknown*"; - - namespace IcuUtil - { -- // Duplicate from ICU to not need to link ISQL with it. It's used by U8_NEXT_UNSAFE. -- static const uint8_t utf8_countTrailBytes[256] = { -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -- -- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -- -- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -- 3, 3, 3, 3, 3, -- 3, 3, 3, /* illegal in Unicode */ -- 4, 4, 4, 4, /* illegal in Unicode */ -- 5, 5, /* illegal in Unicode */ -- 0, 0 /* illegal bytes 0xfe and 0xff */ -- }; -- - // Return the number of characters of a string. - static unsigned charLength(SSHORT charset, unsigned len, const char* str) - { --- a/builds/posix/Makefile.in +++ b/builds/posix/Makefile.in @@ -425,7 +425,8 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB