icu/icu4c-aix.patch

   1 --- misc/icu/source/config/mh-aix-gcc   2009-01-15 01:46:10.000000000 -0600
   2 +++ misc/build/icu/source/config/mh-aix-gcc     2010-06-24 20:58:16.000000000 -0500
   3 @@ -1,10 +1,7 @@
   4  ## -*-makefile-*-
   5 -## Copyright (c) 2003-2009 IBM, Ken Foskey, and others. All rights reserved.
   6 -##
   7 -## Aix-specific setup (for gcc)
   8 -##
   9 -## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability).
  10 -## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1
  11 +## Linux-specific setup
  12 +## Copyright (c) 1999-2006, International Business Machines Corporation and
  13 +## others. All Rights Reserved.
  14
  15  # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and cdatatst.c)
  16  CFLAGS += -D_ALL_SOURCE
  17 @@ -13,84 +10,30 @@
  18  GEN_DEPS.c=    $(CC) -E -MM $(DEFS) $(CPPFLAGS)
  19  GEN_DEPS.cc=   $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
  20
  21 -## Commands to link
  22 -## We need to use the C++ linker, even when linking C programs, since
  23 -##  our libraries contain C++ code (C++ static init not called)
  24 -LINK.c=                $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS)
  25 -LINK.cc=       $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS)
  26 -
  27 -## Shared library options
  28 -LD_SOOPTIONS= -Wl,-bsymbolic
  29 -
  30 -## Commands to make a shared library
  31 -SHLIB.c=    $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS)
  32 -SHLIB.cc=   $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_SOOPTIONS)
  33 +## Flags for position independent code
  34 +SHAREDLIBCFLAGS = -fPIC
  35 +SHAREDLIBCXXFLAGS = -fPIC
  36 +SHAREDLIBCPPFLAGS = -DPIC
  37 +
  38 +## Additional flags when building libraries and with threads
  39 +THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
  40 +LIBCPPFLAGS =
  41
  42  ## Compiler switch to embed a runtime search path
  43 -LD_RPATH=      -I
  44 -LD_RPATH_PRE=
  45 -
  46 -## enable the shared lib loader
  47 -LDFLAGS += -Wl,-bbigtoc
  48 +LD_RPATH=
  49 +LD_RPATH_PRE=
  50
  51  ## These are the library specific LDFLAGS
  52  LDFLAGSICUDT=-nodefaultlibs -nostdlib
  53
  54 -## We need to delete things prior to linking, or else we'll get
  55 -## SEVERE ERROR: output file in use ..  on AIX.
  56 -## But, shell script version should NOT delete target as we don't
  57 -## have $@ in that context.  (SH = only shell script, icu-config)
  58 -AIX_PREDELETE=rm -f $@ ;
  59 -#SH# AIX_PREDELETE=
  60 -
  61  ## Environment variable to set a runtime search path
  62  LDLIBRARYPATH_ENVVAR = LIBPATH
  63
  64 -## Override Versioned target for a shared library.
  65 -FINAL_SO_TARGET=  $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
  66 -MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
  67 -SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ)))
  68 -SHARED_OBJECT_NO_VERSION = $(basename $(SO_TARGET)).$(SOBJ)
  69 -
  70 -# The following is for Makefile.inc's use.
  71 -ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
  72 -
  73 -# this one is for icudefs.mk's use
  74 -ifeq ($(ENABLE_SHARED),YES)
  75 -SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
  76 -endif
  77 -
  78 -## Compiler switch to embed a library name. Not present on AIX.
  79 -LD_SONAME =
  80 -
  81 -## The type of assembly needed when pkgdata is used for generating shared libraries.
  82 -GENCCODE_ASSEMBLY=-a xlc
  83 -
  84  ## Shared object suffix
  85 -SOBJ=   so
  86 -# without the -brtl option, the library names use .a. AIX is funny that way.
  87 -SO=    a
  88 -A=     a
  89 +SO = so
  90
  91  ## Non-shared intermediate object suffix
  92 -STATIC_O = o
  93 -
  94 -## Special AIX rules
  95 -
  96 -## Build archive from shared object
  97 -%.a : %.so
  98 -       ln -f $< $(SHARED_OBJECT_NO_VERSION)
  99 -       $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION)
 100 -       rm -f $(SHARED_OBJECT_NO_VERSION)
 101 -$(LIBDIR)/%.a : %.so
 102 -       ln -f $< $(SHARED_OBJECT_NO_VERSION)
 103 -       $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION)
 104 -       rm -f $(SHARED_OBJECT_NO_VERSION)
 105 -
 106 -## Build import list from export list
 107 -%.e : %.exp
 108 -       @echo "Building an import list for $<"
 109 -       @$(SHELL) -ec "echo '#! $*.a($*.so)' | cat - $< > $@"
 110 +STATIC_O = ao
 111
 112  ## Compilation rules
 113  %.$(STATIC_O): $(srcdir)/%.c
 114 @@ -118,10 +61,10 @@
 115                 [ -s $@ ] || rm -f $@'
 116
 117  ## Versioned libraries rules
 118 -%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
 119 -       $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 120 -%.$(SO): %$(SO_TARGET_VERSION).$(SO)
 121 -       $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
 122 +%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
 123 +       $(RM) $@ && ln -s ${<F} $@
 124 +%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
 125 +       $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
 126
 127
 128  ## BIR  - bind with internal references [so app data and icu data doesn't collide]
 129 --- misc/icu/source/tools/pkgdata/pkgdata.cpp   2013-03-15 22:12:06.000000000 +0000
 130 +++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp     2013-04-06 20:56:00.935656635 +0100
 131 @@ -888,7 +888,7 @@
 132
 133          uprv_strcat(pkgDataFlags[SO_EXT], ".");
 134          uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]);
 135 -#elif U_PLATFORM == U_PF_OS400 || defined(_AIX)
 136 +#elif U_PLATFORM == U_PF_OS400
 137          sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s.%s",
 138                  libFileNames[LIB_FILE],
 139                  pkgDataFlags[SOBJ_EXT]);
 140 @@ -1302,15 +1298,6 @@
 141                  pkgDataFlags[LDICUDTFLAGS],
 142                  targetDir,
 143                  libFileNames[LIB_FILE_CYGWIN_VERSION],
 144 -#elif U_PLATFORM == U_PF_AIX
 145 -        sprintf(cmd, "%s %s%s;%s %s -o %s%s %s %s%s %s %s",
 146 -                RM_CMD,
 147 -                targetDir,
 148 -                libFileNames[LIB_FILE_VERSION_TMP],
 149 -                pkgDataFlags[GENLIB],
 150 -                pkgDataFlags[LDICUDTFLAGS],
 151 -                targetDir,
 152 -                libFileNames[LIB_FILE_VERSION_TMP],
 153  #else
 154          sprintf(cmd, "%s %s -o %s%s %s %s%s %s %s",
 155                  pkgDataFlags[GENLIB],