Skip to content

Corrections, improvements, cleanup and runner upgrade for the MacOS build #8787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 26, 2025
Merged

Corrections, improvements, cleanup and runner upgrade for the MacOS build #8787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1eca7b1
Add class PodOptional
asfernandes Oct 23, 2025
e5ceaf0
Replace std::optional by PodOptional in YYSTYPE
asfernandes Oct 23, 2025
afb91a6
Update MacOS runners accordingly to announced deprecations
asfernandes Oct 23, 2025
fc252f8
Fix ICU build.
asfernandes Oct 23, 2025
d8fb127
Remove obsolete MacOS ports
asfernandes Oct 23, 2025
07634ef
Do not forward (and forward incorrectly) Firebird build flags to tool…
asfernandes Oct 23, 2025
e5baff3
MacOS build improvements
asfernandes Oct 23, 2025
73d65f6
Avoid build vcpkg debug libraries
asfernandes Oct 23, 2025
b58ce93
Remove obsolete MacOS ports
asfernandes Oct 23, 2025
8ef8d38
Fix incorrect flags forwarding causing warnings.
asfernandes Oct 23, 2025
e7fc9b6
Simplify shared library link commands
asfernandes Oct 23, 2025
0812d13
Fix warnings about usage of linker flags in compile commands
asfernandes Oct 23, 2025
7018c3f
Simplify shared library link commands
asfernandes Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ jobs:

build-macos:
name: build-macos-${{ matrix.arch }}
runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
runs-on: ${{ (matrix.arch == 'arm64' && 'macos-15') || 'macos-15-intel' }}

strategy:
fail-fast: false
Expand Down
11 changes: 0 additions & 11 deletions builds/install/arch-specific/darwin/embed.Info.plist
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions builds/install/arch-specific/darwin/embed.darwin
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion builds/posix/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ ifeq ($(CLIENT_ONLY_FLG),N)
CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/btyacc
endif

CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" LD_FLAGS="$(WLDFLAGS)" $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop core
CXX="$(CXX)" LD_FLAGS="$(PLATFORM_LDFLAGS)" $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop core

CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/decNumber
ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(STATIC_LIB)
Expand Down
2 changes: 1 addition & 1 deletion builds/posix/darwin.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#FirebirdInstallPrefix=
LIB_BUNDLE_OPTIONS=$(LD_FLAGS) -bundle
LIB_LINK_OPTIONS=$(LD_FLAGS) -dynamiclib
LIB_LINK_SONAME:=-current_version @FIREBIRD_VERSION@ -compatibility_version @FIREBIRD_VERSION@ -seg1addr 0x30000000
LIB_LINK_SONAME:=-current_version @FIREBIRD_VERSION@ -compatibility_version @FIREBIRD_VERSION@
LIB_LINK_MAPFILE=-Wl,-exported_symbols_list,$(1)

ADD_LIBS:=-lobjc -framework Foundation -framework Security
Expand Down
22 changes: 11 additions & 11 deletions builds/posix/make.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,41 +360,41 @@ LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
FIREBIRD_LIBRARY_LINK= -L$(LIB) -L$(STATIC_LIB) -lfbclient $(MATHLIB) $(CRYPTLIB)

EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(call LINK_DARWIN_RPATH,..) $(LINK_EMPTY_SYMBOLS)
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared $(call LINK_DARWIN_RPATH,..)

FB_DAEMON = $(BIN)/firebird$(EXEC_EXT)

# Per-library link rules
LINK_UDF = $(LIB_LINK) $(LIB_LINK_OPTIONS) $(call LIB_LINK_SONAME,$(1).$(SHRLIB_EXT)) $(UNDEF_FLAGS)\
$(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
$(call LIB_LINK_RPATH,lib)
LINK_UDF_LIBS = $(THR_LIBS) -L$(LIB) -L$(STATIC_LIB) -lib_util $(SO_LINK_LIBS)

LINK_IB_UTIL = $(LIB_LINK) $(LINK_IBUTIL_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(IbUtilLibraryName)) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
$(call LIB_LINK_SONAME,$(IbUtilLibraryName)) $(call LIB_LINK_RPATH,lib)
LINK_IB_UTIL_LIBS = $(THR_LIBS)

LINK_INTL = $(LIB_LINK) $(LINK_FBINTL_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,libfbintl.$(SHRLIB_EXT).1) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
$(call LIB_LINK_SONAME,libfbintl.$(SHRLIB_EXT).1) $(call LIB_LINK_RPATH,lib)
LINK_INTL_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS) $(FIREBIRD_LIBRARY_LINK)

LINK_TRACE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(LIB_PREFIX)fbtrace.$(SHRLIB_EXT).0) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
$(call LIB_LINK_SONAME,$(LIB_PREFIX)fbtrace.$(SHRLIB_EXT).0) $(call LIB_LINK_RPATH,lib)
LINK_TRACE_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS)

LINK_FIREBIRD = $(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(LibrarySoName)) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
$(call LIB_LINK_SONAME,$(LibrarySoName)) $(call LIB_LINK_RPATH,lib)
LINK_FIREBIRD_LIBS = -L$(LIB) -L$(STATIC_LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(MATHLIB)

LINK_ENGINE = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_FIREBIRD_OPTIONS) $(UNDEF_FLAGS)\
$(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
$(call LIB_LINK_SONAME,$(EngineSoName)) $(call LIB_LINK_RPATH,lib)
LINK_ENGINE_LIBS = $(LINK_FIREBIRD_LIBS) $(RE2LIB) $(LIBCDSLIB) $(FIREBIRD_LIBRARY_LINK)

LINK_UDRENG = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)\
$(call LINK_DARWIN_RPATH,..)
LINK_UDRENG = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)

LINK_UDRENG_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS)

LINK_PLUGIN = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)\
$(call LINK_DARWIN_RPATH,..)
LINK_PLUGIN = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)

LINK_PLUG_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS)

# Pay attention - we place common library into obj, not lib dir
Expand Down
3 changes: 2 additions & 1 deletion builds/posix/make.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ WCXXFLAGS = $(WFLAGS) $(PLUSPLUS_FLAGS) $(PLATFORM_PLUSPLUS_FLAGS) $(CXXFLAGS) $
WLDFLAGS = $(LDFLAGS) $(AC_LDFLAGS)

ifneq ($(PLATFORM),DARWIN)
WLDFLAGS += -static-libstdc++
PLATFORM_LDFLAGS="-static-libstdc++"
WLDFLAGS += $(PLATFORM_LDFLAGS)
endif

# Here we have definitions for using the preprocessor.
Expand Down
12 changes: 7 additions & 5 deletions builds/posix/prefix.darwin_aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,19 @@
#DYLD_PRINT_LIBRARIES=1
#export DYLD_PRINT_LIBRARIES

MACOSX_DEPLOYMENT_TARGET=11.0
MACOSX_DEPLOYMENT_TARGET=12.7
export MACOSX_DEPLOYMENT_TARGET

PROD_FLAGS=-DDARWIN -DARM64 -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=11.0
DEV_FLAGS=-ggdb -DDARWIN -DARM64 -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=11.0 -Wno-non-virtual-dtor
PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof

PROD_FLAGS=-DDARWIN -DARM64 -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=12.7
DEV_FLAGS=-ggdb -DDARWIN -DARM64 -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=12.7 -Wno-non-virtual-dtor
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden

UNDEF_PLATFORM=

LINK_LIBS+=-liconv
#LINK_LIBS+=-liconv
#MATHLIB=$(ROOT)/extern/libtommath/.libs/libtommath.a
SO_LINK_LIBS+=-liconv
#SO_LINK_LIBS+=-liconv

include $(ROOT)/gen/darwin.defaults
39 changes: 0 additions & 39 deletions builds/posix/prefix.darwin_i386
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions builds/posix/prefix.darwin_powerpc
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions builds/posix/prefix.darwin_ppc64
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions builds/posix/prefix.darwin_x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,17 @@ export DYLD_LIBRARY_PATH
DYLD_FALLBACK_LIBRARY_PATH=/opt/local/lib
export DYLD_FALLBACK_LIBRARY_PATH

MACOSX_DEPLOYMENT_TARGET=10.9
MACOSX_DEPLOYMENT_TARGET=12.7
export MACOSX_DEPLOYMENT_TARGET

PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=10.7
DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.7 -Wno-non-virtual-dtor
PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof

PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=12.7
DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=12.7 -Wno-non-virtual-dtor
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -msse4

LD_FLAGS+=-liconv
FIREBIRD_LIBRARY_LINK+=-liconv
#LD_FLAGS+=-liconv
#FIREBIRD_LIBRARY_LINK+=-liconv
UNDEF_PLATFORM=

include $(ROOT)/gen/darwin.defaults
1 change: 1 addition & 0 deletions builds/win32/msvc15/common.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
<ClInclude Include="..\..\..\src\common\classes\NoThrowTimeStamp.h" />
<ClInclude Include="..\..\..\src\common\classes\objects_array.h" />
<ClInclude Include="..\..\..\src\common\classes\ParsedList.h" />
<ClInclude Include="..\..\..\src\common\classes\PodOptional.h" />
<ClInclude Include="..\..\..\src\common\classes\QualifiedMetaString.h" />
<ClInclude Include="..\..\..\src\common\classes\RefCounted.h" />
<ClInclude Include="..\..\..\src\common\classes\RefMutex.h" />
Expand Down
3 changes: 3 additions & 0 deletions builds/win32/msvc15/common.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,9 @@
<ClInclude Include="..\..\..\src\common\classes\objects_array.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\PodOptional.h">
<Filter>headers</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\common\classes\RefCounted.h">
<Filter>headers</Filter>
</ClInclude>
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ case "$build" in
*-*-darwin*)
CFLAGS="$CFLAGS -I${VCPKG_INSTALLED}/include"
CXXFLAGS="$CXXFLAGS -nostdinc++ -isystem ${VCPKG_INSTALLED}/include/c++/v1 -I${VCPKG_INSTALLED}/include"
LDFLAGS="$LDFLAGS -nostdlib++ -stdlib=libc++ -L${VCPKG_INSTALLED}/lib -lc++"
LDFLAGS="$LDFLAGS -nostdlib++ -L${VCPKG_INSTALLED}/lib -lc++"
;;
esac

Expand Down
4 changes: 0 additions & 4 deletions extern/cloop/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ ifeq ($(TARGET),release)
CXX_FLAGS += -O3
endif

ifeq ($(shell uname),Darwin)
CXX_FLAGS += -stdlib=libc++
endif

ifeq ($(TARGET),debug)
FPC_FLAGS += -g
LD_FLAGS += -ggdb
Expand Down
Loading
Loading