[Firebird-checkins] SF.net SVN: firebird:[59659] firebird/trunk

[<ale...@us...>]

Revision: 59659
          http://sourceforge.net/p/firebird/code/59659
Author:   alexpeshkoff
Date:     2014-06-06 10:29:23 +0000 (Fri, 06 Jun 2014)
Log Message:
-----------
Avoid loading <string> by ICU

Modified Paths:
--------------
    firebird/trunk/builds/posix/make.android.arme
    firebird/trunk/builds/posix/make.rules
    firebird/trunk/src/include/cross/android.arme
    firebird/trunk/src/include/firebird.h

Modified: firebird/trunk/builds/posix/make.android.arme
===================================================================
--- firebird/trunk/builds/posix/make.android.arme	2014-06-05 00:40:23 UTC (rev 59658)
+++ firebird/trunk/builds/posix/make.android.arme	2014-06-06 10:29:23 UTC (rev 59659)
@@ -5,10 +5,15 @@
 NDK_ROOT:=$(NDK)
 NDK_LOG:=1
 include $(NDK)/build/core/init.mk
-NDK_TOOLCHAIN_VERSION:= 4.6
+TOOLCHAIN_DIR:=$(foreach chain, $(NDK_ALL_TOOLCHAINS), $(if $(findstring arm, $(chain)), $(chain), ))
+TOOLCHAIN_DIR:=$(strip $(TOOLCHAIN_DIR))
+ifeq ($(HOST_TAG64),)
+HOST_TAG64:=linux-x86
+endif
+NDK_TOOLCHAIN_VERSION:=$(shell echo $(TOOLCHAIN_DIR) | awk -F - '{print $$NF;}')
 
 CROSS_PLATFORM:=$(NDK)/platforms/android-9/arch-arm
-CROSS_PREFIX:=$(NDK)/toolchains/arm-linux-androideabi-$(NDK_TOOLCHAIN_VERSION)/prebuilt/$(HOST_TAG64)/bin/arm-linux-androideabi-
+CROSS_PREFIX:=$(NDK)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG64)/bin/arm-linux-androideabi-
 
 CXX:=$(CROSS_PREFIX)g++
 CC:=$(CROSS_PREFIX)gcc
@@ -23,17 +28,17 @@
 
 COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DANDROID -DARM -pipe -MMD -fPIC -fmessage-length=0 \
 			 -I$(ROOT)/extern/libtommath --sysroot=$(CROSS_PLATFORM) \
-			 -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
-OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer
+			 -I/usr/include
+OPTIMIZE_FLAGS=-O0 -fno-omit-frame-pointer		# optimizing cause bugs... - i.e. -O0
 WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
 
 PROD_FLAGS=$(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-#DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
 DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
 
 CROSS_CONFIG=android.arme
 
-LDFLAGS += --sysroot=$(CROSS_PLATFORM) -L$(NDK)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/armeabi
+LDFLAGS += --sysroot=$(CROSS_PLATFORM) -L$(NDK)/sources/cxx-stl/gnu-libstdc++/$(NDK_TOOLCHAIN_VERSION)/libs/armeabi \
+	-L$(NDK)/sources/cxx-stl/gnu-libstdc++/libs/armeabi
 DroidLibs := -lm -ldl -lsupc++
 
 LINK_LIBS = $(DroidLibs)

Modified: firebird/trunk/builds/posix/make.rules
===================================================================
--- firebird/trunk/builds/posix/make.rules	2014-06-05 00:40:23 UTC (rev 59658)
+++ firebird/trunk/builds/posix/make.rules	2014-06-06 10:29:23 UTC (rev 59659)
@@ -35,9 +35,9 @@
 WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include $(CPPFLAGS)
 
 ifeq ($(TARGET),Release)
-  WFLAGS:= $(PROD_FLAGS) $(WFLAGS)
+  WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
 else
-  WFLAGS:= $(DEV_FLAGS) $(WFLAGS) -DDEV_BUILD
+  WFLAGS:= $(WFLAGS) $(DEV_FLAGS) -DDEV_BUILD
 endif
 
 WCFLAGS:= $(WFLAGS) $(THR_FLAGS) $(CFLAGS) $(GLOB_OPTIONS)

Modified: firebird/trunk/src/include/cross/android.arme
===================================================================
--- firebird/trunk/src/include/cross/android.arme	2014-06-05 00:40:23 UTC (rev 59658)
+++ firebird/trunk/src/include/cross/android.arme	2014-06-06 10:29:23 UTC (rev 59659)
@@ -368,6 +368,9 @@
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
 
+/* Define to 1 if you have the `sigset' function. */
+#define HAVE_SIGSET 1
+
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 

Modified: firebird/trunk/src/include/firebird.h
===================================================================
--- firebird/trunk/src/include/firebird.h	2014-06-05 00:40:23 UTC (rev 59658)
+++ firebird/trunk/src/include/firebird.h	2014-06-06 10:29:23 UTC (rev 59659)
@@ -75,4 +75,7 @@
 #define TRUSTED_AUTH
 #endif
 
+// We do not use std::string
+#define U_HAVE_STD_STRING 0
+
 #endif // INCLUDE_Firebird_H

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.