ICU-6.2.6.tar.gz

diff --git a/icuSources/test/intltest/restest.cpp b/icuSources/test/intltest/restest.cpp
index a4fb06dd1198a65af1b8b63a2edf430ee85fa39b..9471bf89089370729b2758a8d946b645f0d4602b 100644 (file)
--- a/icuSources/test/intltest/restest.cpp
+++ b/icuSources/test/intltest/restest.cpp
@@ -85,7 +85,7 @@ itoa(int32_t i, char* buf)
 
 // Array of our test objects
 
 
 // Array of our test objects
 

-struct
+static struct

 {
     const char* name;
     Locale *locale;
 {
     const char* name;
     Locale *locale;


@@ -108,7 +108,7 @@ param[] =
     { "ne",         NULL,   U_USING_DEFAULT_WARNING,  e_Root,      { TRUE, FALSE, FALSE }, { TRUE, FALSE, FALSE } }
 };
 
     { "ne",         NULL,   U_USING_DEFAULT_WARNING,  e_Root,      { TRUE, FALSE, FALSE }, { TRUE, FALSE, FALSE } }
 };
 

-int32_t bundles_count = sizeof(param) / sizeof(param[0]);
+static const int32_t bundles_count = sizeof(param) / sizeof(param[0]);

 
 //***************************************************************************************
 
 
 //***************************************************************************************
 

diff --git a/makefile b/makefile
index a4d01949589206d5378fb6b5cb12955101478514..d85cd0fc7f14881bb9c82795362c1cfe0bedb491 100644 (file)
--- a/makefile
+++ b/makefile
@@ -139,19 +139,19 @@ LIBOVERRIDES=LIBICUDT="-L$(OBJROOT) -l$(LIB_NAME)" \
 
 ENV=   APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
        CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions" \
 
 ENV=   APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
        CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions" \

-       CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions -fno-rtti" \
+       CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -g -Os -fno-exceptions -fno-rtti -fvisibility-inlines-hidden" \

        RC_ARCHS="$(RC_ARCHS)" \
        DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib"
        
 ENV_CONFIGURE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
        CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -g -Os -fno-exceptions" \
        RC_ARCHS="$(RC_ARCHS)" \
        DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib"
        
 ENV_CONFIGURE= APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
        CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -g -Os -fno-exceptions" \

-       CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -g -Os -fno-exceptions -fno-rtti" \
+       CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" -g -Os -fno-exceptions -fno-rtti -fvisibility-inlines-hidden" \

        RC_ARCHS="$(RC_ARCHS)" \
        DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib"
 
 ENV_DEBUG = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
        CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -O0 -g -fno-exceptions" \
        RC_ARCHS="$(RC_ARCHS)" \
        DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib"
 
 ENV_DEBUG = APPLE_INTERNAL_DIR="$(APPLE_INTERNAL_DIR)" \
        CFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -O0 -g -fno-exceptions" \

-       CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -O0 -g -fno-exceptions -fno-rtti" \
+       CXXFLAGS="-DICU_DATA_DIR=\"\\\"/usr/share/icu/\\\"\" $(RC_ARCHS:%=-arch %) -O0 -g -fno-exceptions -fno-rtti -fvisibility-inlines-hidden" \

        RC_ARCHS="$(RC_ARCHS)" \
        DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib"
 
        RC_ARCHS="$(RC_ARCHS)" \
        DYLD_LIBRARY_PATH="$(DSTROOT)/usr/local/lib"
 


@@ -178,8 +178,10 @@ endif
 icu debug : $(OBJROOT)/Makefile
        (cd $(OBJROOT); \
                $(MAKE) $($(ENV_$@)); \
 icu debug : $(OBJROOT)/Makefile
        (cd $(OBJROOT); \
                $(MAKE) $($(ENV_$@)); \

+               tmpfile=`mktemp -t weakexternal` || exit 1; \
+               nm -m $(COMMON_OBJ) $(I18N_OBJ) $(STUB_DATA_OBJ) | fgrep "weak external" | fgrep -v "undefined" | sed -e 's/.*weak external //' | uniq | cat >$$tmpfile; \

                $($(ENV_$@)) $(CXX) -current_version $(ICU_VERS).$(ICU_SUBVERS) -compatibility_version 1 -dynamiclib -dynamic \
                $($(ENV_$@)) $(CXX) -current_version $(ICU_VERS).$(ICU_SUBVERS) -compatibility_version 1 -dynamiclib -dynamic \

-                       $(RC_ARCHS:%=-arch %) $(CXXFLAGS) $(LDFLAGS) -single_module $(SECTORDER_FLAGS) \
+                       $(RC_ARCHS:%=-arch %) $(CXXFLAGS) $(LDFLAGS) -single_module $(SECTORDER_FLAGS) -unexported_symbols_list $$tmpfile \

                        -install_name $(libdir)$(INSTALLED_DYLIB) -o ./$(INSTALLED_DYLIB) $(COMMON_OBJ) $(I18N_OBJ) $(STUB_DATA_OBJ); \
                if test -f ./$(ICU_DATA_DIR)/$(B_DATA_FILE); then \
                        ln -fs ./$(ICU_DATA_DIR)/$(B_DATA_FILE); \
                        -install_name $(libdir)$(INSTALLED_DYLIB) -o ./$(INSTALLED_DYLIB) $(COMMON_OBJ) $(I18N_OBJ) $(STUB_DATA_OBJ); \
                if test -f ./$(ICU_DATA_DIR)/$(B_DATA_FILE); then \
                        ln -fs ./$(ICU_DATA_DIR)/$(B_DATA_FILE); \