fdf7bd6c1c
0a42105a8d "firebird: fix CXXFLAGS" had added this
to override Firebird's internal -std=gnu++03, but even back then the CXXFLAGS
set there already included $(CXXFLAGS_CXX11) (so adding an explicit -std=gnu++11
should never have been necessary), and CXXFLAGS_CXX11 has by now moved beyond
-std=gnu++11 to at least -std=c++20.
Which reveals that the code has a C++20 incompatibility that only GCC so far
complains about (see the mailing list thread starting at
<https://lists.isocpp.org/std-discussion/2024/01/2482.php> "simple-template-id
in a constructor declaration"),
> In file included from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/gpre/../gpre/../common/../jrd/../common/classes/fb_string.h:39,
> from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/gpre/../gpre/../common/../jrd/ods.h:38,
> from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/gpre/../gpre/../common/dsc.h:32,
> from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/gpre/../gpre/gpre.h:1514,
> from /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/gpre/hsh.cpp:31:
> /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/include/../common/classes/alloc.h:264:36: error: expected ')' before '*' token
> 264 | SubsystemThreadData* subThreadData,
> | ^
> | )
> /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/UnpackedTarball/firebird/src/include/../common/classes/alloc.h:263:9: note: to match this '('
> 263 | (
> | ^
(<https://ci.libreoffice.org/job/gerrit_linux_gcc_release/157406/>), etc.
Change-Id: I89839452a0d474467ae62e57b6c990354e10f142
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162209
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
85 lines
3.4 KiB
Makefile
85 lines
3.4 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_UnpackedTarball_UnpackedTarball,firebird))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,firebird,$(FIREBIRD_TARBALL)))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_patchlevel,firebird,0))
|
|
|
|
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,firebird,\
|
|
builds/make.new/config \
|
|
extern/editline \
|
|
))
|
|
|
|
# * external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 is upstream at
|
|
# <https://github.com/FirebirdSQL/firebird/pull/227> "Make comparison operator member functions
|
|
# const";
|
|
# * external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 is upstream at
|
|
# <https://github.com/FirebirdSQL/firebird/pull/301> "Fix checks for null HANDLE in Windows-only
|
|
# code",
|
|
# * external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 is upstream
|
|
# at <https://github.com/FirebirdSQL/firebird/pull/302> "extern/cloop: Missing dependency of
|
|
# $(BIN_DIR)/cloop on $(BIN_DIR)",
|
|
# * external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 is upstream
|
|
# at <https://github.com/FirebirdSQL/firebird/pull/6948> "extern/cloop: Missing dependencies of
|
|
# compilations on output directories":
|
|
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
|
|
external/firebird/firebird.disable-ib-util-not-found.patch.1 \
|
|
external/firebird/firebird-Engine12.patch \
|
|
external/firebird/firebird-rpath.patch.0 \
|
|
external/firebird/wnt-dbgutil.patch \
|
|
external/firebird/c++17.patch \
|
|
external/firebird/ubsan.patch \
|
|
external/firebird/asan.patch \
|
|
external/firebird/firebird-tdf125284.patch.1 \
|
|
external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 \
|
|
external/firebird/0001-Fix-warning-on-Win64-build-231.patch.1 \
|
|
external/firebird/macos-arm64.patch.0 \
|
|
external/firebird/firebird-btyacc-add-explicit-rule.patch \
|
|
external/firebird/firebird-307.patch.1 \
|
|
external/firebird/0001-Fix-checks-for-null-HANDLE-in-Windows-only-code.patch.1 \
|
|
external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 \
|
|
external/firebird/msvc.patch \
|
|
external/firebird/wnt-per-process-trace-storage.patch.1 \
|
|
external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \
|
|
external/firebird/configure-c99.patch \
|
|
external/firebird/Wincompatible-function-pointer-types.patch \
|
|
external/firebird/c++26.patch \
|
|
external/firebird/c++20.patch \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
|
|
external/firebird/firebird-cygwin-msvc.patch \
|
|
external/firebird/firebird-cygwin-msvc-warnings.patch \
|
|
external/firebird/firebird-vs2017.patch.1 \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
|
|
external/firebird/firebird-macosx.patch.1 \
|
|
external/firebird/macosx-elcapitan-dyld.patch \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,firebird,\
|
|
external/firebird/firebird-macosx-sandbox.patch.1 \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(filter -fsanitize=%,$(CC)),)
|
|
$(eval $(call gb_UnpackedTarball_add_patches,firebird, \
|
|
external/firebird/sanitizer.patch \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|