blob: 0b20f83f1c51c56d385f088337f06f40a7eb811e (
plain) (
blame)
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
|
--- builds/posix/make.defaults.orig 2016-06-30 09:34:53 UTC
+++ builds/posix/make.defaults
@@ -126,7 +126,7 @@ RM_R= rm -rf
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
@@ -152,7 +152,7 @@ EXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFL
STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFLAGS)
LINK_LIBS = @LIBS@
-ICU_LIBS = -licuuc -licudata -licui18n
+ICU_LIBS = $(shell icu-config --ldflags)
STATICLINK_LIBS = @LIBS@
SO_LINK_LIBS = @LIBS@
@@ -223,16 +223,12 @@ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
ifeq ($(EDITLINE_FLG),Y)
ifeq ($(STD_EDITLINE), true)
- LIBEDITLINE := -l$(READLINE)
+ LIBEDITLINE := $(shell pkgconf libedit --libs)
else
LIBEDITLINE := $(LIB)/libedit.a
endif
endif
-LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \
- $(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \
- $(LIB)/$(LIB_PREFIX)icui18n*.$(SHRLIB_FOREIGN_EXT)
-
# Shared library name for usage inside of the UDF
IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT)
LIBIBUTIL_SO = $(LIB)/$(IbUtilLibraryName)
|
