1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
--- builds/posix/make.defaults.orig 2024-08-08 09:26:44 UTC
+++ builds/posix/make.defaults
@@ -102,7 +102,7 @@ GLOB_OPTIONS:=
#____________________________________________________________________________
# Firebird needs no RTTI
-RTTI_FLAG:= -fno-rtti
+RTTI_FLAG:= -fno-rtti -DU_SHOW_CPLUSPLUS_API=0 -DU_SHOW_CPLUSPLUS_HEADER_API=0
# If this is defined then we use special rules useful for developers only
IsDeveloper = @DEVEL_FLG@
@@ -134,7 +134,7 @@ MATHLIB=@MATHLIB@
MATHLIB=@MATHLIB@
# switch to make sed edit files inplace
-INLINE_EDIT_SED:= -i
+INLINE_EDIT_SED:= -i ""
# Default programs and tools to be used in the build process
@@ -144,7 +144,7 @@ CHMOD_7= chmod 777
CHMOD= chmod
CHMOD_6= chmod 666
CHMOD_7= chmod 777
-CHMOD_S7= chmod 06777
+CHMOD_S7= chmod 04555
MV= mv -f
TOUCH= touch
CP= cp
@@ -219,7 +219,7 @@ LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${Fir
#LibraryFileName=libfbclient
LibraryFileName=libfbclient
LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
-LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2
+LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.3
LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
@@ -240,7 +240,7 @@ ifeq ($(EDITLINE_FLG),Y)
ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE), true)
- LIBEDITLINE := -l$(READLINE)
+ LIBEDITLINE := $(shell pkgconf libedit --libs)
else
LIBEDITLINE := $(LIB)/libedit.a
endif
@@ -362,7 +362,7 @@ FBTRACEMGR = $(BIN)/fbtracemgr$(EXEC_EXT)
GDS_DROP = $(BIN)/gds_drop$(EXEC_EXT)
FBSVCMGR = $(BIN)/fbsvcmgr$(EXEC_EXT)
FBTRACEMGR = $(BIN)/fbtracemgr$(EXEC_EXT)
-GSTAT = $(BIN)/gstat$(EXEC_EXT)
+GSTAT = $(BIN)/fbstat$(EXEC_EXT)
NBACKUP = $(BIN)/nbackup$(EXEC_EXT)
LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT)
GSEC = $(BIN)/gsec$(EXEC_EXT)
@@ -383,13 +383,13 @@ QLI = $(BIN)/qli$(EXEC_EXT)
QLI = $(BIN)/qli$(EXEC_EXT)
# From isql
-ISQL = $(BIN)/isql$(EXEC_EXT)
-RUN_ISQL = $(RBIN)/isql$(EXEC_EXT)
+ISQL = $(BIN)/isql-fb$(EXEC_EXT)
+RUN_ISQL = $(RBIN)/isql-fb$(EXEC_EXT)
# From burp
GBAK = $(BIN)/gbak$(EXEC_EXT)
RUN_GBAK = $(RBIN)/gbak$(EXEC_EXT)
-GSPLIT = $(BIN)/gsplit$(EXEC_EXT)
+GSPLIT = $(BIN)/fbsplit$(EXEC_EXT)
# From gpre
# (gpre current is a link to one of the others)
|
