Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firebird ver. bump

Browse Source
This commit is contained in:
Rmys
2025-02-23 13:06:46 +03:00
parent 72bcba6ba1
commit 8ab734d110
11 changed files with 1074 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/database/firebird/actions.py
+19 -14
View File
@@ -13,19 +13,21 @@ from pisi.actionsapi import get
#WorkDir="Firebird-%s-0" % get.srcVERSION()
def setup():
# pisitools.flags.add(" -lpthread")
shelltools.export("CFLAGS", "%s -fno-strict-aliasing" % get.CFLAGS())
#shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse -Wno-error=narrowing" % get.CXXFLAGS())
pisitools.dosed("src/isql/isql.epp", '"isql\s', '"fbsql ')
pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ')
pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ')
pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ')
shelltools.export("CXXFLAGS", "%s -fno-delete-null-pointer-checks" % get.CXXFLAGS())
# pisitools.dosed("src/isql/isql.epp", '"isql\s', '"fbsql ')
# pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ')
# pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ')
# pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ')
shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x")
#for d in ("btyacc", "editline", "icu"):
#shelltools.unlinkDir("extern/%s" % d)
shelltools.system("sh autogen.sh")
autotools.autoreconf("-fi")
autotools.configure("--prefix=/opt/firebird \
--with-fbconf=/etc/firebird \
--disable-static \
--enable-superserver \
--with-editline \
@@ -37,8 +39,8 @@ def setup():
def build():
#Parallel build is broken
#shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse -Wno-error=narrowing" % get.CXXFLAGS())
autotools.make("-j1")
shelltools.export("CXXFLAGS", "%s -fno-delete-null-pointer-checks" % get.CXXFLAGS())
autotools.make()
shelltools.cd("gen")
pisitools.dosed("install/makeInstallImage.sh", "exit 1", "# exit 1")
pisitools.dosed("install/makeInstallImage.sh", "chown", 'echo ""# chown')
@@ -54,7 +56,7 @@ def install():
pisitools.domove("/opt/firebird/include", "/usr/include", "firebird")
# Fix client libraries symlinks
pisitools.removeDir("/usr/lib*")
# pisitools.removeDir("/usr/lib*")
for libs in os.listdir("%s/opt/firebird/lib" % get.installDIR()):
pisitools.dosym("/opt/firebird/lib/%s" % libs, "/usr/lib/%s" % libs)
pisitools.dosym("/opt/firebird/plugins/libfbtrace.so", "/usr/lib/libfbtrace.so")
@@ -66,19 +68,19 @@ def install():
pisitools.dosym("libfbclient.so", "/opt/firebird/lib/libgds.so.0")
# Move configuration files and security DB to /etc/firebird for painless upgrade
pisitools.domove("/opt/firebird/aliases.conf", "/etc/firebird")
pisitools.domove("/opt/firebird/firebird.conf", "/etc/firebird")
pisitools.domove("/opt/firebird/security2.fdb", "/etc/firebird")
pisitools.dosym("/etc/firebird/aliases.conf", "/opt/firebird/aliases.conf")
# pisitools.domove("/opt/firebird/aliases.conf", "/etc/firebird") ???????????????????????????????
# pisitools.domove("/opt/firebird/firebird.conf", "/etc/firebird")
pisitools.domove("/opt/firebird/security4.fdb", "/etc/firebird")
# pisitools.dosym("/etc/firebird/aliases.conf", "/opt/firebird/aliases.conf")
pisitools.dosym("/etc/firebird/firebird.conf", "/opt/firebird/firebird.conf")
pisitools.dosym("/etc/firebird/security2.fdb", "/opt/firebird/security2.fdb")
pisitools.dosym("/etc/firebird/security4.fdb", "/opt/firebird/security4.fdb")
# Set PID directory
shelltools.makedirs("%s/run/firebird" % get.installDIR())
#pisitools.dodir("/opt/firebird/run")
# Set permissions
shelltools.chmod("%s/etc/firebird/security2.fdb" % get.installDIR(), 0600)
shelltools.chmod("%s/etc/firebird/security4.fdb" % get.installDIR(), 0600)
shelltools.chmod("%s/run/firebird" % get.installDIR(), 0755)
#shelltools.chmod("%s/opt/firebird/run" % get.installDIR(), 0755)
@@ -89,3 +91,6 @@ def install():
# Prevent to conflict isql with UnixODBC's
pisitools.domove("/opt/firebird/bin/isql", "/opt/firebird/bin", "fb_isql")
pisitools.remove("/etc/firebird/*.md")
pisitools.remove("/etc/firebird/*.txt")
server/database/firebird/comar/package.py
+1 -1
View File
@@ -26,7 +26,7 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
os.chmod(log_file, 0644)
# Configure security2.fdb file
os.chown("/opt/firebird/security2.fdb", uid, -1)
os.chown("/opt/firebird/security4.fdb", uid, -1)
# Create lock files
for lock_filename in ("isc_guard1", "isc_init1", "isc_lock1"):
server/database/firebird/files/fedora/autoconf.patch
+23
View File
@@ -0,0 +1,23 @@
From 3fe8f6510de79689a26868e244840b24dcb19567 Mon Sep 17 00:00:00 2001
From: AlexPeshkoff <alexander.peshkoff@gmail.com>
Date: Wed, 23 Nov 2022 20:30:03 +0300
Subject: [PATCH] Fixed #7394: autoconf 2.72 support
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 75af92e862c..800453d25fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,8 +696,9 @@ if test "$STD_EDITLINE" = "true"; then
AC_CHECK_LIB(readline, readline, [READLINE=readline EDITLINE_FLG=Y],
[STD_EDITLINE=false
if test "$EDITLINE_FLG" = "Y"; then
- AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])])))
+ AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])
fi
+ ])))
fi
XE_RESTORE_ENV()
server/database/firebird/files/fedora/btyacc-honour-build-flags.patch
+12
View File
@@ -0,0 +1,12 @@
--- a/extern/btyacc/Makefile 2022-08-12 15:24:40.846774310 +0200
+++ a/extern/btyacc/Makefile 2022-08-12 15:26:20.954809720 +0200
@@ -12,7 +12,7 @@
# across all of our supported compilers/platforms.
# Vanilla CFLAGS
-CFLAGS=
+CFLAGS=-fPIC -pie
# No LDFLAGS
#LDFLAGS=
server/database/firebird/files/fedora/c++17.patch
+144
View File
@@ -0,0 +1,144 @@
From ff49d71b0cdbab75f8a22717c4f88343a5961868 Mon Sep 17 00:00:00 2001
From: Adriano dos Santos Fernandes <adrianosf@gmail.com>
Date: Mon, 31 May 2021 08:55:26 -0300
Subject: [PATCH] Set POSIX build to use C++17.
---
CMakeLists.txt | 4 ++--
builds/posix/make.defaults | 2 +-
builds/posix/prefix.freebsd_amd64 | 2 +-
configure.ac | 2 +-
examples/extauth/Makefile | 2 +-
examples/interfaces/makefile | 2 +-
extern/icu/android/aarch64/config.sh | 2 +-
extern/icu/android/armv7a/config.sh | 4 ++--
extern/icu/android/linux/config.sh | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 620fd032af4..5f336efd611 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,14 +206,14 @@ if (MINGW)
set(CMAKE_STATIC_LIBRARY_PREFIX)
add_definitions(-D_WIN32_WINNT=0x0600)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4 -std=c++17")
endif()
if (UNIX)
set(OS_DIR posix)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -msse4 -std=c++17")
if (NOT CMAKE_CROSSCOMPILING)
set(LIB_readline readline)
diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index d96e89053fa..57bbb006865 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -103,7 +103,7 @@ GLOB_OPTIONS:=
#____________________________________________________________________________
# Global c++ flags: firebird needs no RTTI, choose build standard
-PLUSPLUS_FLAGS:= -fno-rtti -std=c++11
+PLUSPLUS_FLAGS:= -fno-rtti -std=c++17
# If this is defined then we use special rules useful for developers only
IsDeveloper = @DEVEL_FLG@
diff --git a/builds/posix/prefix.freebsd_amd64 b/builds/posix/prefix.freebsd_amd64
index f27567a2715..0736d87e935 100644
--- a/builds/posix/prefix.freebsd_amd64
+++ b/builds/posix/prefix.freebsd_amd64
@@ -26,4 +26,4 @@ DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dto
# This file must be compiled with SSE4.2 support
%/CRC32C.o: CXXFLAGS += -msse4
-CXXFLAGS := $(CXXFLAGS) -std=c++11
+CXXFLAGS := $(CXXFLAGS) -std=c++17
diff --git a/configure.ac b/configure.ac
index 9b40be43101..e4a83cf8d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -899,7 +899,7 @@ dnl if 64-bit mode, then archive tool, ar, needs -X64 option
fi
XE_SAVE_ENV()
-CXXFLAGS="$CXXFLAGS -std=c++11"
+CXXFLAGS="$CXXFLAGS -std=c++17"
AC_CACHE_CHECK([whether the C++ compiler understands noexcept], [ac_cv_cxx_noexcept], [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int f(int x) noexcept { return x + 1; }]], [[]])],
[ac_cv_cxx_noexcept=yes], [ac_cv_cxx_noexcept=no])])
diff --git a/examples/extauth/Makefile b/examples/extauth/Makefile
index 9da7bbd357f..3c8b878d225 100644
--- a/examples/extauth/Makefile
+++ b/examples/extauth/Makefile
@@ -61,7 +61,7 @@ KEYGEN_objects=$(INTERMED)/keygen.o
TCWRAP_objects=$(INTERMED)/TcWrapper.o
KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
-CXXFLAGS=-std=c++11 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
+CXXFLAGS=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
LINK_LIBS=-lfbclient -ltomcrypt -ltommath
diff --git a/examples/interfaces/makefile b/examples/interfaces/makefile
index 153c3d558dc..b65dba90a7d 100644
--- a/examples/interfaces/makefile
+++ b/examples/interfaces/makefile
@@ -33,7 +33,7 @@ FBCLIENT = $(FIREBIRD)/lib/libfbclient.so
# General Compiler and linker Defines for Linux
# ---------------------------------------------------------------------
CXX = c++
-CXXFLAGS= -c -Wall -g3 -std=c++11 -fno-rtti $(INCLUDE)
+CXXFLAGS= -c -Wall -g3 -std=c++17 -fno-rtti $(INCLUDE)
RM = rm -f
#
diff --git a/extern/icu/android/aarch64/config.sh b/extern/icu/android/aarch64/config.sh
index 51ef623a3c5..f464d930ec2 100755
--- a/extern/icu/android/aarch64/config.sh
+++ b/extern/icu/android/aarch64/config.sh
@@ -18,7 +18,7 @@
--enable-dyload \
--with-cross-build=$CROSS_BUILD_DIR \
CFLAGS='-Os' \
- CXXFLAGS='--std=c++11' \
+ CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++' \
CC=aarch64-linux-android24-clang \
CXX=aarch64-linux-android24-clang++ \
diff --git a/extern/icu/android/armv7a/config.sh b/extern/icu/android/armv7a/config.sh
index fe1bd037456..0e458c690e7 100755
--- a/extern/icu/android/armv7a/config.sh
+++ b/extern/icu/android/armv7a/config.sh
@@ -18,10 +18,10 @@
--enable-dyload \
--with-cross-build=$CROSS_BUILD_DIR \
CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
- CXXFLAGS='--std=c++11 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
+ CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8' \
CC=arm-linux-androideabi-clang \
CXX=arm-linux-androideabi-clang++ \
AR=arm-linux-androideabi-ar \
RANLIB=arm-linux-androideabi-ranlib \
- --with-data-packaging=archive
\ No newline at end of file
+ --with-data-packaging=archive
diff --git a/extern/icu/android/linux/config.sh b/extern/icu/android/linux/config.sh
index a8b56024aae..6e7d9c5f5c8 100755
--- a/extern/icu/android/linux/config.sh
+++ b/extern/icu/android/linux/config.sh
@@ -1,7 +1,7 @@
#!/bin/sh
../source/runConfigureICU Linux --prefix=$PWD/prebuilt \
CFLAGS="-Os" \
- CXXFLAGS="--std=c++11" \
+ CXXFLAGS="--std=c++17" \
--enable-static \
--enable-shared=no \
--enable-extras=no \
server/database/firebird/files/fedora/cloop-honour-build-flags.patch
+54
View File
@@ -0,0 +1,54 @@
Description: make cloop build honor compiler/linker flags from the environment
Author: Damyan Ivanov <dmn@debian.org>
Forwarded: no
--- a/extern/cloop/Makefile
+++ b/extern/cloop/Makefile
@@ -27,8 +27,8 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
-CXX_FLAGS := $(C_FLAGS) -std=c++11
+C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter $(CPPFLAGS) $(CFLAGS)
+CXX_FLAGS := $(C_FLAGS) $(CXXFLAGS) -std=c++11
FPC_FLAGS := -Mdelphi -Cg
ifeq ($(shell uname),FreeBSD)
@@ -94,7 +94,7 @@ $(BIN_DIR)/cloop: \
$(OBJ_DIR)/cloop/Main.o \
| $(BIN_DIR)
- $(LD) $^ -o $@ $(LIBS)
+ $(LD) $(LDFLAGS) $^ -o $@ $(LIBS)
$(SRC_DIR)/tests/test1/CalcCApi.h: $(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl
$(BIN_DIR)/cloop $(SRC_DIR)/tests/test1/Interface.idl c-header $@ CALC_C_API_H CALC_I
@@ -121,23 +121,23 @@ $(BIN_DIR)/test1-c$(SHRLIB_EXT): \
$(OBJ_DIR)/tests/test1/CalcCApi.o \
$(OBJ_DIR)/tests/test1/CTest.o \
- $(LD) $^ -shared $(DL_LIB) -o $@ $(LIBS)
+ $(LD) $(LDFLAGS) $^ -shared $(DL_LIB) -o $@ $(LIBS)
$(BIN_DIR)/test1-c$(EXE_EXT): \
$(OBJ_DIR)/tests/test1/CalcCApi.o \
$(OBJ_DIR)/tests/test1/CTest.o \
- $(LD) $^ $(DL_LIB) -o $@ $(LIBS)
+ $(LD) $(LDFLAGS) $^ $(DL_LIB) -o $@ $(LIBS)
$(BIN_DIR)/test1-cpp$(SHRLIB_EXT): \
$(OBJ_DIR)/tests/test1/CppTest.o \
- $(LD) $^ -shared $(DL_LIB) -o $@ $(LIBS)
+ $(LD) $(LDFLAGS) $^ -shared $(DL_LIB) -o $@ $(LIBS)
$(BIN_DIR)/test1-cpp$(EXE_EXT): \
$(OBJ_DIR)/tests/test1/CppTest.o \
- $(LD) $^ $(DL_LIB) -o $@ $(LIBS)
+ $(LD) $(LDFLAGS) $^ $(DL_LIB) -o $@ $(LIBS)
$(BIN_DIR)/test1-pascal$(SHRLIB_EXT): \
$(SRC_DIR)/tests/test1/PascalClasses.pas \
server/database/firebird/files/fedora/examples-honour-build-flags.patch
+28
View File
@@ -0,0 +1,28 @@
diff --git a/builds/posix/Makefile.in.plugins_examples b/builds/posix/Makefile.in.plugins_examples
index 989e80d..344f487 100644
--- a/builds/posix/Makefile.in.plugins_examples
+++ b/builds/posix/Makefile.in.plugins_examples
@@ -101,7 +101,7 @@ AllObjects += $(CA_Objects)
crypt_app: $(CRYPT_APP)
$(CRYPT_APP): $(CA_Objects)
- $(EXE_LINK) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
+ $(EXE_LINK) $(EXE_LINK_OPTIONS) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
include $(ROOT)/gen/make.shared.targets
diff --git a/examples/extauth/Makefile b/examples/extauth/Makefile
index 3c8b878..7de22a8 100644
--- a/examples/extauth/Makefile
+++ b/examples/extauth/Makefile
@@ -61,8 +61,8 @@ KEYGEN_objects=$(INTERMED)/keygen.o
TCWRAP_objects=$(INTERMED)/TcWrapper.o
KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
-CXXFLAGS=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
-LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
+CXXFLAGS+=-std=c++17 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
+LDFLAGS+=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
LINK_LIBS=-lfbclient -ltomcrypt -ltommath
server/database/firebird/files/fedora/firebird-configure-c99.patch
+45
View File
@@ -0,0 +1,45 @@
Add missing int return types for main in the configure script.
Implicit ints are a language feature that was removed in C99.
Submitted upstream: <https://github.com/FirebirdSQL/firebird/pull/7407>
diff --git a/configure.ac b/configure.ac
index 05edb5ec9410ff50..0474dc850dfd04bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1038,7 +1038,7 @@ AC_CHECK_FUNCS(sem_init)
if test "$ac_cv_func_sem_init" = "yes"; then
AC_MSG_CHECKING(for working sem_init())
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
- main () {
+ int main () {
sem_t s;
return sem_init(&s,0,0);
}
@@ -1079,7 +1079,7 @@ AC_SYS_LARGEFILE
if test "$ac_cv_sys_file_offset_bits" = "no"; then
AC_MSG_CHECKING(for native large file support)
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
- main () {
+ int main () {
return !(sizeof(off_t) == 8);
}]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
@@ -1126,7 +1126,7 @@ dnl EKU: try to determine the alignment of long and double
dnl replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
AC_MSG_CHECKING(alignment of long)
AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
-main () {
+int main () {
struct s {
char a;
union { long long x; sem_t y; } b;
@@ -1137,7 +1137,7 @@ AC_MSG_RESULT($ac_cv_c_alignment)
AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
AC_MSG_CHECKING(alignment of double)
-AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
+AC_RUN_IFELSE([AC_LANG_SOURCE([[int main () {
struct s {
char a;
double b;
server/database/firebird/files/fedora/no-copy-from-icu.patch
+51
View File
@@ -0,0 +1,51 @@
Description: Link isql with ICU instead of embedding part of it in the source
Author: Damyan Ivanov <dmn@debian.org>
--- 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
@@ -543,7 +543,7 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB
isql: $(ISQL)
$(ISQL): $(ISQL_Objects) $(COMMON_LIB)
- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS)
+ $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(ICU_LIBS)
nbackup: $(NBACKUP)
server/database/firebird/files/fedora/noexcept.patch
+664
View File
@@ -0,0 +1,664 @@
From a999f35f0fad27798fdc88a3f5cdf2e3e9041594 Mon Sep 17 00:00:00 2001
From: Adriano dos Santos Fernandes <adrianosf@gmail.com>
Date: Mon, 31 May 2021 08:55:26 -0300
Subject: [PATCH] Replace FB_NOTHROW by noexcept and remove FB_THROW.
---
src/common/classes/alloc.cpp | 128 +++++++++++++++++------------------
src/common/classes/alloc.h | 74 ++++++++------------
2 files changed, 94 insertions(+), 108 deletions(-)
diff --git a/src/common/classes/alloc.cpp b/src/common/classes/alloc.cpp
index 1bd6ad4f09d..ee91ab89df8 100644
--- a/src/common/classes/alloc.cpp
+++ b/src/common/classes/alloc.cpp
@@ -68,19 +68,19 @@
#define VALGRIND_FIX_IT // overrides suspicious valgrind behavior
#endif // USE_VALGRIND
-void* operator new(size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+void* operator new(size_t s ALLOC_PARAMS)
{
return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS);
}
-void* operator new[](size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+void* operator new[](size_t s ALLOC_PARAMS)
{
return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS);
}
-void operator delete(void* mem ALLOC_PARAMS) FB_NOTHROW
+void operator delete(void* mem ALLOC_PARAMS) noexcept
{
MemoryPool::globalFree(mem);
}
-void operator delete[](void* mem ALLOC_PARAMS) FB_NOTHROW
+void operator delete[](void* mem ALLOC_PARAMS) noexcept
{
MemoryPool::globalFree(mem);
}
@@ -109,7 +109,7 @@ static const int GUARD_BYTES = 0;
#endif
template <typename T>
-T absVal(T n) FB_NOTHROW
+T absVal(T n) noexcept
{
return n < 0 ? -n : n;
}
@@ -160,7 +160,7 @@ struct FailedBlock
FailedBlock* failedList = NULL;
#endif
-void corrupt(const char* text) FB_NOTHROW
+void corrupt(const char* text) noexcept
{
#ifdef DEV_BUILD
fprintf(stderr, "%s\n", text);
@@ -377,7 +377,7 @@ class MemHeader
#ifdef MEM_DEBUG
void print_contents(bool used, FILE* file, bool used_only,
- const char* filter_path, const size_t filter_len) FB_NOTHROW
+ const char* filter_path, const size_t filter_len) noexcept
{
if (used || !used_only)
{
@@ -406,7 +406,7 @@ class MemHeader
}
#endif
- void validate(MemPool* p, StatInt& vUse) FB_NOTHROW
+ void validate(MemPool* p, StatInt& vUse) noexcept
{
if (p == pool && !isExtent())
vUse += getSize();
@@ -461,7 +461,7 @@ class MemBaseHunk
}
public:
- void validate(MemPool* pool, size_t hdr, StatInt& vMap, StatInt& vUse) FB_NOTHROW
+ void validate(MemPool* pool, size_t hdr, StatInt& vMap, StatInt& vUse) noexcept
{
if (length >= DEFAULT_ALLOCATION)
{
@@ -526,7 +526,7 @@ class MemSmallHunk : public MemBaseHunk<MemSmallHunk>
#ifdef MEM_DEBUG
void print_contents(FILE* file, MemPool* pool, bool used_only,
- const char* filter_path, const size_t filter_len) FB_NOTHROW
+ const char* filter_path, const size_t filter_len) noexcept
{
UCHAR* m = ((UCHAR*) this) + hdrSize();
fprintf(file, "Small hunk %p: memory=[%p:%p) spaceRemaining=%" SIZEFORMAT " length=%" SIZEFORMAT "\n",
@@ -598,7 +598,7 @@ class MemMediumHunk : public MemBaseHunk<MemMediumHunk>
#ifdef MEM_DEBUG
void print_contents(FILE* file, MemPool* pool, bool used_only,
- const char* filter_path, const size_t filter_len) FB_NOTHROW
+ const char* filter_path, const size_t filter_len) noexcept
{
UCHAR* m = ((UCHAR*) this) + hdrSize();
fprintf(file, "Medium hunk %p: memory=[%p:%p) spaceRemaining=%" SIZEFORMAT " length=%" SIZEFORMAT "\n",
@@ -630,7 +630,7 @@ class MemBigHunk
#ifdef MEM_DEBUG
void print_contents(FILE* file, MemPool* pool, bool used_only,
- const char* filter_path, const size_t filter_len) FB_NOTHROW
+ const char* filter_path, const size_t filter_len) noexcept
{
fprintf(file, "Big hunk %p: memory=%p length=%" SIZEFORMAT "\n",
this, block, length);
@@ -1647,7 +1647,7 @@ class FreeObjects
~FreeObjects();
- FreeObjPtr allocateBlock(MemPool* pool, size_t from, size_t& size) FB_THROW (OOM_EXCEPTION)
+ FreeObjPtr allocateBlock(MemPool* pool, size_t from, size_t& size)
{
size_t full_size = size + (from ? 0 : ListBuilder::MEM_OVERHEAD);
if (full_size > Limits::TOP_LIMIT)
@@ -1696,7 +1696,7 @@ class FreeObjects
#ifdef MEM_DEBUG
void print_contents(FILE* file, MemPool* pool, bool used_only,
- const char* filter_path, const size_t filter_len) FB_NOTHROW
+ const char* filter_path, const size_t filter_len) noexcept
{
for (Extent* ext = currentExtent; ext; ext = ext->next)
ext->print_contents(file, pool, used_only, filter_path, filter_len);
@@ -1717,7 +1717,7 @@ class FreeObjects
ListBuilder listBuilder;
Extent* currentExtent;
- MemBlock* newBlock(MemPool* pool, unsigned slot) FB_THROW (OOM_EXCEPTION);
+ MemBlock* newBlock(MemPool* pool, unsigned slot);
};
@@ -1799,26 +1799,26 @@ class MemPool
};
#endif // VALIDATE_POOL
- MemBlock* alloc(size_t from, size_t& length, bool flagRedirect) FB_THROW (OOM_EXCEPTION);
- void releaseBlock(MemBlock *block, bool flagDecr) FB_NOTHROW;
+ MemBlock* alloc(size_t from, size_t& length, bool flagRedirect);
+ void releaseBlock(MemBlock *block, bool flagDecr) noexcept;
public:
- void* allocate(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
- MemBlock* allocate2(size_t from, size_t& size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
+ void* allocate(size_t size ALLOC_PARAMS);
+ MemBlock* allocate2(size_t from, size_t& size ALLOC_PARAMS);
private:
- virtual void memoryIsExhausted(void) FB_THROW (OOM_EXCEPTION);
- void* allocRaw(size_t length) FB_THROW (OOM_EXCEPTION);
- static void releaseMemory(void* block, bool flagExtent) FB_NOTHROW;
- static void releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) FB_NOTHROW;
- void* getExtent(size_t from, size_t& to) FB_THROW (OOM_EXCEPTION);
+ virtual void memoryIsExhausted(void);
+ void* allocRaw(size_t length);
+ static void releaseMemory(void* block, bool flagExtent) noexcept;
+ static void releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) noexcept;
+ void* getExtent(size_t from, size_t& to);
public:
- static void releaseExtent(bool destroying, void *block, size_t size, MemPool* pool) FB_NOTHROW;
+ static void releaseExtent(bool destroying, void *block, size_t size, MemPool* pool) noexcept;
// pass desired size, return actual extent size
template <class Extent>
- void newExtent(size_t& size, Extent** linkedList) FB_THROW (OOM_EXCEPTION);
+ void newExtent(size_t& size, Extent** linkedList);
private:
#ifdef USE_VALGRIND
@@ -1830,9 +1830,9 @@ class MemPool
public:
static void deletePool(MemPool* pool);
- static void globalFree(void* block) FB_NOTHROW;
+ static void globalFree(void* block) noexcept;
- static void deallocate(void* block) FB_NOTHROW;
+ static void deallocate(void* block) noexcept;
bool validate(char* buf, FB_SIZE_T size);
// Create memory pool instance
@@ -1840,7 +1840,7 @@ class MemPool
// Set statistics group for pool. Usage counters will be decremented from
// previously set group and added to new
- void setStatsGroup(MemoryStats& stats) FB_NOTHROW;
+ void setStatsGroup(MemoryStats& stats) noexcept;
// Initialize and finalize global memory pool
static MemPool* init()
@@ -1893,25 +1893,25 @@ class MemPool
}
// Statistics
- void increment_usage(size_t size) FB_NOTHROW
+ void increment_usage(size_t size) noexcept
{
stats->increment_usage(size);
used_memory += size;
}
- void decrement_usage(size_t size) FB_NOTHROW
+ void decrement_usage(size_t size) noexcept
{
stats->decrement_usage(size);
used_memory -= size;
}
- void increment_mapping(size_t size) FB_NOTHROW
+ void increment_mapping(size_t size) noexcept
{
stats->increment_mapping(size);
mapped_memory += size;
}
- void decrement_mapping(size_t size) FB_NOTHROW
+ void decrement_mapping(size_t size) noexcept
{
stats->decrement_mapping(size);
mapped_memory -= size;
@@ -1919,9 +1919,9 @@ class MemPool
#ifdef MEM_DEBUG
// Print out pool contents. This is debugging routine
- void print_contents(FILE*, unsigned flags, const char* filter_path) FB_NOTHROW;
+ void print_contents(FILE*, unsigned flags, const char* filter_path) noexcept;
// The same routine, but more easily callable from the debugger
- void print_contents(const char* filename, unsigned flags, const char* filter_path) FB_NOTHROW;
+ void print_contents(const char* filename, unsigned flags, const char* filter_path) noexcept;
private:
MemPool* next;
@@ -1961,7 +1961,7 @@ void DoubleLinkedList::decrUsage(MemMediumHunk* hunk, MemPool* pool)
template <class ListBuilder, class Limits>
-MemBlock* FreeObjects<ListBuilder, Limits>::newBlock(MemPool* pool, unsigned slot) FB_THROW (OOM_EXCEPTION)
+MemBlock* FreeObjects<ListBuilder, Limits>::newBlock(MemPool* pool, unsigned slot)
{
size_t size = Limits::getSize(slot);
@@ -2170,7 +2170,7 @@ MemPool::~MemPool(void)
}
template <class Extent>
-void MemPool::newExtent(size_t& size, Extent** linkedList) FB_THROW(OOM_EXCEPTION)
+void MemPool::newExtent(size_t& size, Extent** linkedList)
{
// No large enough block found. We need to extend the pool
void* memory = NULL;
@@ -2214,7 +2214,7 @@ MemoryPool* MemoryPool::createPool(MemoryPool* parentPool, MemoryStats& stats)
return FB_NEW_POOL(*parentPool) MemoryPool(p);
}
-void MemPool::setStatsGroup(MemoryStats& newStats) FB_NOTHROW
+void MemPool::setStatsGroup(MemoryStats& newStats) noexcept
{
MutexLockGuard guard(mutex, "MemPool::setStatsGroup");
@@ -2230,12 +2230,12 @@ void MemPool::setStatsGroup(MemoryStats& newStats) FB_NOTHROW
stats->increment_usage(sav_used_memory);
}
-void MemoryPool::setStatsGroup(MemoryStats& newStats) FB_NOTHROW
+void MemoryPool::setStatsGroup(MemoryStats& newStats) noexcept
{
pool->setStatsGroup(newStats);
}
-MemBlock* MemPool::alloc(size_t from, size_t& length, bool flagRedirect) FB_THROW (OOM_EXCEPTION)
+MemBlock* MemPool::alloc(size_t from, size_t& length, bool flagRedirect)
{
MutexEnsureUnlock guard(mutex, "MemPool::alloc");
guard.enter();
@@ -2294,7 +2294,7 @@ MemBlock* MemPool::allocate2(size_t from, size_t& size
#ifdef DEBUG_GDS_ALLOC
, const char* fileName, int line
#endif
-) FB_THROW (OOM_EXCEPTION)
+)
{
size_t length = from ? size : ROUNDUP(size + VALGRIND_REDZONE, roundingSize) + GUARD_BYTES;
MemBlock* memory = alloc(from, length, true);
@@ -2324,7 +2324,7 @@ MemBlock* MemPool::allocate2(size_t from, size_t& size
}
-void* MemPool::allocate(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+void* MemPool::allocate(size_t size ALLOC_PARAMS)
{
#ifdef VALIDATE_POOL
MutexLockGuard guard(mutex, "MemPool::allocate");
@@ -2339,7 +2339,7 @@ void* MemPool::allocate(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
}
-void MemPool::releaseMemory(void* object, bool flagExtent) FB_NOTHROW
+void MemPool::releaseMemory(void* object, bool flagExtent) noexcept
{
if (object)
{
@@ -2403,7 +2403,7 @@ void MemPool::releaseMemory(void* object, bool flagExtent) FB_NOTHROW
}
}
-void MemPool::releaseBlock(MemBlock* block, bool decrUsage) FB_NOTHROW
+void MemPool::releaseBlock(MemBlock* block, bool decrUsage) noexcept
{
if (block->pool != this)
corrupt("bad block released");
@@ -2464,12 +2464,12 @@ void MemPool::releaseBlock(MemBlock* block, bool decrUsage) FB_NOTHROW
releaseRaw(pool_destroying, hunk, hunk->length, false);
}
-void MemPool::memoryIsExhausted(void) FB_THROW (OOM_EXCEPTION)
+void MemPool::memoryIsExhausted(void)
{
Firebird::BadAlloc::raise();
}
-void* MemPool::allocRaw(size_t size) FB_THROW (OOM_EXCEPTION)
+void* MemPool::allocRaw(size_t size)
{
#ifndef USE_VALGRIND
if (size == DEFAULT_ALLOCATION)
@@ -2549,7 +2549,7 @@ void* MemPool::allocRaw(size_t size) FB_THROW (OOM_EXCEPTION)
}
-void* MemPool::getExtent(size_t from, size_t& to) FB_THROW(OOM_EXCEPTION) // pass desired minimum size, return actual extent size
+void* MemPool::getExtent(size_t from, size_t& to) // pass desired minimum size, return actual extent size
{
#ifdef VALIDATE_POOL
MutexLockGuard guard(mutex, "MemPool::getExtent");
@@ -2560,7 +2560,7 @@ void* MemPool::getExtent(size_t from, size_t& to) FB_THROW(OOM_EXCEPTION) // pa
}
-void MemPool::releaseExtent(bool destroying, void* block, size_t size, MemPool* pool) FB_NOTHROW
+void MemPool::releaseExtent(bool destroying, void* block, size_t size, MemPool* pool) noexcept
{
if (size < DEFAULT_ALLOCATION)
releaseMemory(block, true);
@@ -2573,7 +2573,7 @@ void MemPool::releaseExtent(bool destroying, void* block, size_t size, MemPool*
}
-void MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) FB_NOTHROW
+void MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cache) noexcept
{
#ifndef USE_VALGRIND
if (use_cache && (size == DEFAULT_ALLOCATION))
@@ -2666,19 +2666,19 @@ void MemPool::releaseRaw(bool destroying, void* block, size_t size, bool use_cac
}
}
-void MemPool::globalFree(void* block) FB_NOTHROW
+void MemPool::globalFree(void* block) noexcept
{
deallocate(block);
}
-void* MemoryPool::calloc(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+void* MemoryPool::calloc(size_t size ALLOC_PARAMS)
{
void* block = allocate(size ALLOC_PASS_ARGS);
memset(block, 0, size);
return block;
}
-void MemPool::deallocate(void* block) FB_NOTHROW
+void MemPool::deallocate(void* block) noexcept
{
releaseMemory(block, false);
}
@@ -2720,7 +2720,7 @@ bool MemPool::validate(char* buf, FB_SIZE_T size)
}
#ifdef MEM_DEBUG
-void MemPool::print_contents(const char* filename, unsigned flags, const char* filter_path) FB_NOTHROW
+void MemPool::print_contents(const char* filename, unsigned flags, const char* filter_path) noexcept
{
FILE* out = os_utils::fopen(filename, "w");
if (!out)
@@ -2731,7 +2731,7 @@ void MemPool::print_contents(const char* filename, unsigned flags, const char* f
}
// This member function can't be const because there are calls to the mutex.
-void MemPool::print_contents(FILE* file, unsigned flags, const char* filter_path) FB_NOTHROW
+void MemPool::print_contents(FILE* file, unsigned flags, const char* filter_path) noexcept
{
bool used_only = flags & MemoryPool::PRINT_USED_ONLY;
@@ -2818,7 +2818,7 @@ MemoryPool& AutoStorage::getAutoMemoryPool()
}
#ifdef LIBC_CALLS_NEW
-void* MemoryPool::globalAlloc(size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+void* MemoryPool::globalAlloc(size_t s ALLOC_PARAMS)
{
if (!defaultMemoryManager)
{
@@ -2831,17 +2831,17 @@ void* MemoryPool::globalAlloc(size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
}
#endif // LIBC_CALLS_NEW
-void MemoryPool::globalFree(void* block) FB_NOTHROW
+void MemoryPool::globalFree(void* block) noexcept
{
MemPool::globalFree(block);
}
-void* MemoryPool::allocate(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+void* MemoryPool::allocate(size_t size ALLOC_PARAMS)
{
return pool->allocate(size ALLOC_PASS_ARGS);
}
-void MemoryPool::deallocate(void* block) FB_NOTHROW
+void MemoryPool::deallocate(void* block) noexcept
{
pool->deallocate(block);
}
@@ -2870,14 +2870,14 @@ void MemoryPool::deletePool(MemoryPool* pool)
delete pool;
}
-void MemoryPool::print_contents(FILE* file, unsigned flags, const char* filter_path) FB_NOTHROW
+void MemoryPool::print_contents(FILE* file, unsigned flags, const char* filter_path) noexcept
{
#ifdef MEM_DEBUG
pool->print_contents(file, flags, filter_path);
#endif
}
-void MemoryPool::print_contents(const char* filename, unsigned flags, const char* filter_path) FB_NOTHROW
+void MemoryPool::print_contents(const char* filename, unsigned flags, const char* filter_path) noexcept
{
#ifdef MEM_DEBUG
pool->print_contents(filename, flags, filter_path);
@@ -2950,21 +2950,21 @@ void AutoStorage::ProbeStack() const
// in a case when we actually need "new" only with file/line information
// this version should be also present as a pair for "delete".
#ifdef DEBUG_GDS_ALLOC
-void* operator new(size_t s) FB_THROW (OOM_EXCEPTION)
+void* operator new(size_t s)
{
return MemoryPool::globalAlloc(s ALLOC_ARGS);
}
-void* operator new[](size_t s) FB_THROW (OOM_EXCEPTION)
+void* operator new[](size_t s)
{
return MemoryPool::globalAlloc(s ALLOC_ARGS);
}
-void operator delete(void* mem) FB_NOTHROW
+void operator delete(void* mem) noexcept
{
MemoryPool::globalFree(mem);
}
-void operator delete[](void* mem) FB_NOTHROW
+void operator delete[](void* mem) noexcept
{
MemoryPool::globalFree(mem);
}
diff --git a/src/common/classes/alloc.h b/src/common/classes/alloc.h
index 65f9afbb8a9..44d9e0ea462 100644
--- a/src/common/classes/alloc.h
+++ b/src/common/classes/alloc.h
@@ -58,20 +58,6 @@
#include <memory.h>
-#define OOM_EXCEPTION std::bad_alloc
-
-#if __cplusplus >= 201103L
-#define FB_NO_THROW_SPECIFIER
-#endif
-
-#ifdef FB_NO_THROW_SPECIFIER
-#define FB_THROW(x)
-#define FB_NOTHROW noexcept
-#else
-#define FB_THROW(x) throw(x)
-#define FB_NOTHROW throw()
-#endif
-
#ifdef DEBUG_GDS_ALLOC
#define FB_NEW new(__FILE__, __LINE__)
#define FB_NEW_POOL(pool) new(pool, __FILE__, __LINE__)
@@ -106,10 +92,10 @@ class MemoryStats
~MemoryStats()
{}
- size_t getCurrentUsage() const FB_NOTHROW { return mst_usage.value(); }
- size_t getMaximumUsage() const FB_NOTHROW { return mst_max_usage; }
- size_t getCurrentMapping() const FB_NOTHROW { return mst_mapped.value(); }
- size_t getMaximumMapping() const FB_NOTHROW { return mst_max_mapped; }
+ size_t getCurrentUsage() const noexcept { return mst_usage.value(); }
+ size_t getMaximumUsage() const noexcept { return mst_max_usage; }
+ size_t getCurrentMapping() const noexcept { return mst_mapped.value(); }
+ size_t getMaximumMapping() const noexcept { return mst_max_mapped; }
private:
// Forbid copying/assignment
@@ -131,7 +117,7 @@ class MemoryStats
size_t mst_max_mapped;
// These methods are thread-safe due to usage of atomic counters only
- void increment_usage(size_t size) FB_NOTHROW
+ void increment_usage(size_t size) noexcept
{
for (MemoryStats* statistics = this; statistics; statistics = statistics->mst_parent)
{
@@ -141,7 +127,7 @@ class MemoryStats
}
}
- void decrement_usage(size_t size) FB_NOTHROW
+ void decrement_usage(size_t size) noexcept
{
for (MemoryStats* statistics = this; statistics; statistics = statistics->mst_parent)
{
@@ -149,7 +135,7 @@ class MemoryStats
}
}
- void increment_mapping(size_t size) FB_NOTHROW
+ void increment_mapping(size_t size) noexcept
{
for (MemoryStats* statistics = this; statistics; statistics = statistics->mst_parent)
{
@@ -159,7 +145,7 @@ class MemoryStats
}
}
- void decrement_mapping(size_t size) FB_NOTHROW
+ void decrement_mapping(size_t size) noexcept
{
for (MemoryStats* statistics = this; statistics; statistics = statistics->mst_parent)
{
@@ -205,21 +191,21 @@ class MemoryPool
#define ALLOC_PASS_ARGS
#endif // DEBUG_GDS_ALLOC
- void* calloc(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
+ void* calloc(size_t size ALLOC_PARAMS);
#ifdef LIBC_CALLS_NEW
- static void* globalAlloc(size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
+ static void* globalAlloc(size_t s ALLOC_PARAMS);
#else
- static void* globalAlloc(size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+ static void* globalAlloc(size_t s ALLOC_PARAMS)
{
return defaultMemoryManager->allocate(s ALLOC_PASS_ARGS);
}
#endif // LIBC_CALLS_NEW
- void* allocate(size_t size ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
+ void* allocate(size_t size ALLOC_PARAMS);
- static void globalFree(void* mem) FB_NOTHROW;
- void deallocate(void* mem) FB_NOTHROW;
+ static void globalFree(void* mem) noexcept;
+ void deallocate(void* mem) noexcept;
// Set context pool for current thread of execution
static MemoryPool* setContextPool(MemoryPool* newPool);
@@ -229,7 +215,7 @@ class MemoryPool
// Set statistics group for pool. Usage counters will be decremented from
// previously set group and added to new
- void setStatsGroup(MemoryStats& stats) FB_NOTHROW;
+ void setStatsGroup(MemoryStats& stats) noexcept;
// Initialize and finalize global memory pool
static void init();
@@ -241,9 +227,9 @@ class MemoryPool
// Print out pool contents. This is debugging routine
static const unsigned PRINT_USED_ONLY = 0x01;
static const unsigned PRINT_RECURSIVE = 0x02;
- void print_contents(FILE*, unsigned flags = 0, const char* filter_path = 0) FB_NOTHROW;
+ void print_contents(FILE*, unsigned flags = 0, const char* filter_path = 0) noexcept;
// The same routine, but more easily callable from the debugger
- void print_contents(const char* filename, unsigned flags = 0, const char* filter_path = 0) FB_NOTHROW;
+ void print_contents(const char* filename, unsigned flags = 0, const char* filter_path = 0) noexcept;
public:
struct Finalizer
@@ -298,7 +284,7 @@ class MemoryPool
} // namespace Firebird
-static inline Firebird::MemoryPool* getDefaultMemoryPool() FB_NOTHROW
+static inline Firebird::MemoryPool* getDefaultMemoryPool() noexcept
{
fb_assert(Firebird::MemoryPool::defaultMemoryManager);
return Firebird::MemoryPool::defaultMemoryManager;
@@ -355,36 +341,36 @@ class SubsystemContextPoolHolder : public ContextPoolHolder
using Firebird::MemoryPool;
// operators new and delete
-extern void* operator new(size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
-extern void* operator new[](size_t s ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION);
-extern void operator delete(void* mem ALLOC_PARAMS) FB_NOTHROW;
-extern void operator delete[](void* mem ALLOC_PARAMS) FB_NOTHROW;
+extern void* operator new(size_t s ALLOC_PARAMS);
+extern void* operator new[](size_t s ALLOC_PARAMS);
+extern void operator delete(void* mem ALLOC_PARAMS) noexcept;
+extern void operator delete[](void* mem ALLOC_PARAMS) noexcept;
-inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS)
{
return pool.allocate(s ALLOC_PASS_ARGS);
}
-inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) FB_THROW (OOM_EXCEPTION)
+inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS)
{
return pool.allocate(s ALLOC_PASS_ARGS);
}
-inline void operator delete(void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS) FB_NOTHROW
+inline void operator delete(void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS) noexcept
{
MemoryPool::globalFree(mem);
}
-inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS) FB_NOTHROW
+inline void operator delete[](void* mem, Firebird::MemoryPool& pool ALLOC_PARAMS) noexcept
{
MemoryPool::globalFree(mem);
}
#if __cplusplus >= 201402L
-inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) FB_NOTHROW
+inline void operator delete(void* mem, std::size_t s ALLOC_PARAMS) noexcept
{
MemoryPool::globalFree(mem);
}
-inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) FB_NOTHROW
+inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) noexcept
{
MemoryPool::globalFree(mem);
}
@@ -392,8 +378,8 @@ inline void operator delete[](void* mem, std::size_t s ALLOC_PARAMS) FB_NOTHROW
#ifdef DEBUG_GDS_ALLOC
-extern void operator delete(void* mem) FB_NOTHROW;
-extern void operator delete[](void* mem) FB_NOTHROW;
+extern void operator delete(void* mem) noexcept;
+extern void operator delete[](void* mem) noexcept;
#endif // DEBUG_GDS_ALLOC
server/database/firebird/pspec.xml
+33 -2
View File
@@ -15,11 +15,13 @@
<IsA>library</IsA>
<Summary>A relational database offering many ANSI SQL-99 features</Summary>
<Description>Firebird is an open source relational database management system offering many ANSI SQL-99 features.</Description>
<Archive sha1sum="715845c29e391c4f75d090d400f9550095411404" type="targz">https://github.com/FirebirdSQL/firebird/archive/R2_5_9.tar.gz</Archive>
<Archive sha1sum="9cfc22f51f9d655b39f5b215b3e2bf17834f0321" type="tarxz">https://github.com/FirebirdSQL/firebird/releases/download/v4.0.4/Firebird-4.0.4.3010-0.tar.xz</Archive>
<BuildDependencies>
<Dependency>icu4c-devel</Dependency>
<Dependency>btyacc</Dependency>
<Dependency>libedit-devel</Dependency>
<Dependency>libtommath-devel</Dependency>
<Dependency>libtomcrypt-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch>hosts_equiv.patch</Patch>
@@ -35,7 +37,15 @@
<Patch level="1">Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch</Patch>
<Patch level="1">Firebird-gcc-icu.patch</Patch-->
<!-- <Patch>006-musl-glibc.patch</Patch> -->
<!-- <Patch>007-libio.patch</Patch> -->
<Patch>fedora/no-copy-from-icu.patch</Patch>
<Patch>fedora/cloop-honour-build-flags.patch</Patch>
<Patch>fedora/c++17.patch</Patch>
<Patch>fedora/noexcept.patch</Patch>
<Patch>fedora/autoconf.patch</Patch>
<Patch>fedora/btyacc-honour-build-flags.patch</Patch>
<Patch>fedora/firebird-configure-c99.patch</Patch>
<Patch>fedora/examples-honour-build-flags.patch</Patch>
</Patches>
</Source>
@@ -109,6 +119,27 @@
</Package>
<History>
<Update release="11">
<Date>2025-02-12</Date>
<Version>4.0.4.3010</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2025-02-11</Date>
<Version>3.0.12.33787</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2025-02-11</Date>
<Version>2.5.9.27139</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="8">
<Date>2023-10-17</Date>
<Version>2.5.9.27139</Version>