Skip to content

Commit c9cbd8e

Browse files
asfernandesasfernandes
committed
Add rpath to empbuild in MacOS.
1 parent f5038a8 commit c9cbd8e

File tree

7 files changed

+22
-33
lines changed

7 files changed

+22
-33
lines changed

‎builds/posix/Makefile.in‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ $(LIBFBINTL_SO): $(INTL_Objects) $(COMMON_LIB)
422422
gpre: $(GPRE) databases
423423

424424
$(GPRE): $(GPRE_Objects) $(COMMON_LIB)
425-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
425+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
426426

427427
HELP_FDB = $(FIREBIRD)/help/help.fdb
428428
SECURITY_FDB = $(FIREBIRD)/security4.fdb
@@ -496,62 +496,62 @@ utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix g
496496
firebird_server: $(FB_DAEMON)
497497

498498
$(FB_DAEMON): $(Remote_Server_Objects) $(COMMON_LIB)
499-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
499+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
500500

501501
fb_lock_print: $(LOCKPRINT)
502502

503503
$(LOCKPRINT): $(LOCKPRINT_Objects) $(COMMON_LIB)
504-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
504+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
505505

506506
fbguard: $(FBGUARD)
507507

508508
$(FBGUARD): $(FBGUARD_Objects) $(COMMON_LIB)
509-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
509+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
510510

511511
fbsvcmgr: $(FBSVCMGR)
512512

513513
$(FBSVCMGR): $(FBSVCMGR_Objects) $(COMMON_LIB)
514-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
514+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
515515

516516
fbtracemgr: $(FBTRACEMGR)
517517

518518
$(FBTRACEMGR): $(FBTRACEMGR_Objects) $(COMMON_LIB)
519-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
519+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
520520

521521
gbak: $(GBAK)
522522

523523
$(GBAK): $(GBAK_Objects) $(COMMON_LIB)
524-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
524+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
525525

526526
gsplit: $(GSPLIT)
527527

528528
$(GSPLIT): $(GSPLIT_Objects) $(COMMON_LIB)
529-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
529+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
530530

531531
gfix: $(GFIX)
532532

533533
$(GFIX): $(GFIX_Objects) $(COMMON_LIB)
534-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
534+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
535535

536536
gsec: $(GSEC)
537537

538538
$(GSEC): $(GSEC_Objects) $(COMMON_LIB)
539-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
539+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
540540

541541
gstat: $(GSTAT)
542542

543543
$(GSTAT): $(GSTAT_Objects) $(COMMON_LIB)
544-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
544+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
545545

546546
isql: $(ISQL)
547547

548548
$(ISQL): $(ISQL_Objects) $(COMMON_LIB)
549-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
549+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(TERMLIB) $(LINK_LIBS)
550550

551551
nbackup: $(NBACKUP)
552552

553553
$(NBACKUP): $(NBACKUP_Objects) $(COMMON_LIB)
554-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
554+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
555555

556556

557557
#___________________________________________________________________________
@@ -642,7 +642,7 @@ gen_codes: $(CODES) msg.timestamp
642642
$(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)
643643

644644
$(CODES): $(CODES_Objects) $(COMMON_LIB)
645-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
645+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
646646

647647
#___________________________________________________________________________
648648
# all the rest we need to build
@@ -662,7 +662,7 @@ cross_rest: qli gbak_files
662662
qli: $(QLI)
663663

664664
$(QLI): $(QLI_Objects) $(COMMON_LIB)
665-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
665+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
666666

667667
examples: include_generic
668668
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
@@ -681,7 +681,7 @@ $(FIREBIRD)/tzdata: $(ROOT)/extern/icu/tzdata/$(TZDATA_ZIP)
681681
unzip -o $(ROOT)/extern/icu/tzdata/$(TZDATA_ZIP) -d $(FIREBIRD)/tzdata
682682

683683
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
684-
$(EXE_LINK) $(EXE_LINK_OPTIONS) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
684+
$(EXE_LINK) $(EXE_LINK_OPTIONS) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
685685

686686
gbak_files: $(GBAK_FILES)
687687

‎builds/posix/Makefile.in.examples‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ export PATH
6060
GPRE_FLAGS= -m -z -n
6161

6262
LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
63+
LINK_DARWIN_RPATH = -Wl,-rpath,@loader_path/../$(TARGET)/firebird
6364
LIB_LINK_MAPFILE =
6465

6566
EXAMPLES_DEST= $(GEN_ROOT)/examples

‎builds/posix/make.defaults‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ LIB_LINK_SONAME= -Wl,-soname,$(1)
344344
LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
345345
FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB) $(CRYPTLIB)
346346

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

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

‎builds/posix/prefix.darwin_i386‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
# 2. dnl the CPU_TYPE
2525
# 3. edit extern/icu/source/config and set the right 32bit flags (-arch i386)
2626
# 4. for CFLAGS, CXXFLAGS, LDFLAGS export '-m32 -arch i386'
27-
# 5. export MACOSX_DEPLOYMENT_TARGET=10.7
28-
29-
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
30-
export DYLD_LIBRARY_PATH
27+
# 5. export MACOSX_DEPLOYMENT_TARGET=10.7
3128

3229
MACOSX_DEPLOYMENT_TARGET=10.7
3330
export MACOSX_DEPLOYMENT_TARGET
@@ -36,7 +33,7 @@ PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -arch i386 -mmacosx-version
3633
DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.7 -Wno-non-virtual-dtor
3734
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
3835

39-
EXE_LINK_OPTIONS:=-m32
36+
EXE_LINK_OPTIONS+=-m32
4037
LD_FLAGS+=-m32 -arch i386
4138

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

‎builds/posix/prefix.darwin_powerpc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,11 @@
1717
# Start of file prefix.darwin: $(VERSION) @PLATFORM@
1818
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
1919

20-
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
21-
export DYLD_LIBRARY_PATH
22-
2320
MACOSX_DEPLOYMENT_TARGET=10.2
2421
export MACOSX_DEPLOYMENT_TARGET
2522

2623
PROD_FLAGS=-DDARWIN -pipe -p -MMD -fPIC -fno-common -arch ppc -mmacosx-version-min=10.2
2724
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch ppc -mmacosx-version-min=10.2 -Wno-non-virtual-dtor
2825
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
2926

30-
EXE_LINK_OPTIONS:=
31-
3227
include $(ROOT)/gen/darwin.defaults

‎builds/posix/prefix.darwin_ppc64‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
1919

2020
# To use this file to build 64bit version of Firebird for MacOS 10.5 (Leopard)
21-
# Can only be built on MacOSX 10.5 (Leopard) due to lack of 64bit support in
21+
# Can only be built on MacOSX 10.5 (Leopard) due to lack of 64bit support in
2222
# Carbon in previous versions of MacOSX
2323
# 1. edit configure.in so that MAKEFILE_PREFIX=darwin_ppc64
2424
# 2. uncomment the CPU_TYPE
@@ -29,17 +29,14 @@
2929
# 6. export LDFLAGS='-arch ppc_64'
3030
# 7. export MACOSX_DEPLOYMENT_TARGET=10.5
3131

32-
DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
33-
export DYLD_LIBRARY_PATH
34-
3532
MACOSX_DEPLOYMENT_TARGET=10.5
3633
export MACOSX_DEPLOYMENT_TARGET
3734

3835
PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.5
3936
DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5 -Wno-non-virtual-dtor
4037
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
4138

42-
EXE_LINK_OPTIONS:=-arch ppc64
39+
EXE_LINK_OPTIONS+=-arch ppc64
4340
LD_FLAGS+=-arch ppc64
4441

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

‎builds/posix/prefix.darwin_x86_64‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ PROD_FLAGS=-O1 -DDARWIN -pipe -MMD -fPIC -fno-common -mmacosx-version-min=10.7
3535
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
3636
CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -stdlib=libc++ -msse4
3737

38-
EXE_LINK_OPTIONS:=
3938
LD_FLAGS+=-liconv
4039
FIREBIRD_LIBRARY_LINK+=-liconv
4140
UNDEF_PLATFORM=

0 commit comments

Comments
 (0)