Skip to content

Commit 0df0cad

Browse files
asfernandesasfernandes
authored
Merge pull request #8787 from FirebirdSQL/work/macos15-runner
Corrections, improvements, cleanup and runner upgrade for the MacOS build
2 parents 8df33d6 + 7018c3f commit 0df0cad

File tree

23 files changed

+162
-307
lines changed

23 files changed

+162
-307
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ jobs:
360360
361361
build-macos:
362362
name: build-macos-${{ matrix.arch }}
363-
runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
363+
runs-on: ${{ (matrix.arch == 'arm64' && 'macos-15') || 'macos-15-intel' }}
364364

365365
strategy:
366366
fail-fast: false

‎builds/install/arch-specific/darwin/embed.Info.plist‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎builds/install/arch-specific/darwin/embed.darwin‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎builds/posix/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ifeq ($(CLIENT_ONLY_FLG),N)
197197
CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/btyacc
198198
endif
199199

200-
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
200+
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
201201

202202
CC="$(CC)" CFLAGS="$(CFLAGS)" AR="$(AR)" $(MAKE) -C $(ROOT)/extern/decNumber
203203
ln -sf $(ROOT)/extern/decNumber/libdecFloat.a $(STATIC_LIB)

‎builds/posix/darwin.defaults‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#FirebirdInstallPrefix=
2222
LIB_BUNDLE_OPTIONS=$(LD_FLAGS) -bundle
2323
LIB_LINK_OPTIONS=$(LD_FLAGS) -dynamiclib
24-
LIB_LINK_SONAME:=-current_version @FIREBIRD_VERSION@ -compatibility_version @FIREBIRD_VERSION@ -seg1addr 0x30000000
24+
LIB_LINK_SONAME:=-current_version @FIREBIRD_VERSION@ -compatibility_version @FIREBIRD_VERSION@
2525
LIB_LINK_MAPFILE=-Wl,-exported_symbols_list,$(1)
2626

2727
ADD_LIBS:=-lobjc -framework Foundation -framework Security

‎builds/posix/make.defaults‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,41 +360,41 @@ LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
360360
FIREBIRD_LIBRARY_LINK= -L$(LIB) -L$(STATIC_LIB) -lfbclient $(MATHLIB) $(CRYPTLIB)
361361

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

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

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

372372
LINK_IB_UTIL = $(LIB_LINK) $(LINK_IBUTIL_SYMBOLS) $(LIB_LINK_OPTIONS) $(UNDEF_FLAGS)\
373-
$(call LIB_LINK_SONAME,$(IbUtilLibraryName)) $(call LIB_LINK_RPATH,lib) $(call LINK_DARWIN_RPATH,..)
373+
$(call LIB_LINK_SONAME,$(IbUtilLibraryName)) $(call LIB_LINK_RPATH,lib)
374374
LINK_IB_UTIL_LIBS = $(THR_LIBS)
375375

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

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

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

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

392-
LINK_UDRENG = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)\
393-
$(call LINK_DARWIN_RPATH,..)
392+
LINK_UDRENG = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
393+
394394
LINK_UDRENG_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS)
395395

396-
LINK_PLUGIN = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)\
397-
$(call LINK_DARWIN_RPATH,..)
396+
LINK_PLUGIN = $(LIB_LINK) $(LINK_PLUGIN_SYMBOLS) $(LIB_LINK_OPTIONS) $(call LIB_LINK_RPATH,lib) $(UNDEF_FLAGS)
397+
398398
LINK_PLUG_LIBS = -L$(LIB) -L$(STATIC_LIB) $(SO_LINK_LIBS)
399399

400400
# Pay attention - we place common library into obj, not lib dir

‎builds/posix/make.rules‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ WCXXFLAGS = $(WFLAGS) $(PLUSPLUS_FLAGS) $(PLATFORM_PLUSPLUS_FLAGS) $(CXXFLAGS) $
7171
WLDFLAGS = $(LDFLAGS) $(AC_LDFLAGS)
7272

7373
ifneq ($(PLATFORM),DARWIN)
74-
WLDFLAGS += -static-libstdc++
74+
PLATFORM_LDFLAGS="-static-libstdc++"
75+
WLDFLAGS += $(PLATFORM_LDFLAGS)
7576
endif
7677

7778
# Here we have definitions for using the preprocessor.

‎builds/posix/prefix.darwin_aarch64‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,19 @@
3333
#DYLD_PRINT_LIBRARIES=1
3434
#export DYLD_PRINT_LIBRARIES
3535

36-
MACOSX_DEPLOYMENT_TARGET=11.0
36+
MACOSX_DEPLOYMENT_TARGET=12.7
3737
export MACOSX_DEPLOYMENT_TARGET
3838

39-
PROD_FLAGS=-DDARWIN -DARM64 -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=11.0
40-
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
39+
PLATFORM_PLUSPLUS_FLAGS=-Wno-invalid-offsetof
40+
41+
PROD_FLAGS=-DDARWIN -DARM64 -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=12.7
42+
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
4143
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
4244

4345
UNDEF_PLATFORM=
4446

45-
LINK_LIBS+=-liconv
47+
#LINK_LIBS+=-liconv
4648
#MATHLIB=$(ROOT)/extern/libtommath/.libs/libtommath.a
47-
SO_LINK_LIBS+=-liconv
49+
#SO_LINK_LIBS+=-liconv
4850

4951
include $(ROOT)/gen/darwin.defaults

‎builds/posix/prefix.darwin_i386‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎builds/posix/prefix.darwin_powerpc‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)