organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 06:25:30 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-1898 fixes related to LIB_SUFFIX appearing twice in library names on aix, and also using the libsuffix to calculate the location of Makefile.inc.

Browse source 
X-SVN-Rev: 8759
This commit is contained in:
Steven R. Loomis 2002-05-31 19:18:29 +00:00
parent 31de668781
commit 54d0f3671e
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4c/source/config/Makefile.inc.in
View file

@ -2,7 +2,7 @@
#******************************************************************************
# Copyright (C) 1999-2002, International Business Machines
# Corporation and others. All Rights Reserved.
# $Revision: 1.29 $
# $Revision: 1.30 $
#******************************************************************************
# This Makefile.inc is designed to be included into projects which make use
# of the ICU.
@ -84,17 +84,17 @@ endif
# - $(ICULIBS_LAYOUT) - ICU layout library.
# - $(ICULIBS_USTDIO) - ICU stdio equivalent library
ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_DATA = -l$(ICUPREFIX)data$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_I18N = -l$(ICUPREFIX)i18n$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_TOOLUTIL = -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_USTDIO = -lustdio$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX_VERSION)$(ICULIBSUFFIX)
ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_DATA = -l$(ICUPREFIX)data$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_I18N = -l$(ICUPREFIX)i18n$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_TOOLUTIL = -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_USTDIO = -lustdio$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
ICULIBS_BASE = $(LIBS) -L$(libdir)
# for icu-config to test with
ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX_VERSION}${ICULIBSUFFIX}.${SO}
ICULIBS_COMMON_LIB_NAME = ${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
# ICULIBS is the set of libraries your application should link
# with usually. Many applications will want to add $(ICULIBS_I18N) as well.

4
icu4c/source/config/icu-config-bottom
View file

@ -1,5 +1,5 @@
## -*-sh-*-
## BEGIN of icu-config-bottom. $Revision: 1.3 $
## BEGIN of icu-config-bottom. $Revision: 1.4 $
## Copyright (c) 2002, International Business Machines Corporation and
## others. All Rights Reserved.
@ -252,7 +252,7 @@ do
;;
--incfile)
echo $libdir/icu/$VERSION/Makefile.inc
echo $pkglibdir/Makefile.inc
;;
--icudata)

14
icu4c/source/config/mh-aix
View file

@ -3,7 +3,7 @@
## Copyright (c) 1999-2002, International Business Machines Corporation and
## others. All Rights Reserved.
##
## $Id: mh-aix,v 1.31 2002/05/13 23:50:12 grhoten-oss Exp $
## $Id: mh-aix,v 1.32 2002/05/31 19:18:29 srl Exp $
##
## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability).
## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1
@ -36,8 +36,8 @@ LD_RPATH_PRE=
LDLIBRARYPATH_ENVVAR = LIBPATH
## Override Versioned target for a shared library.
FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO)
MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR)$(ICULIBSUFFIX).$(SO)
FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
# The following is for Makefile.inc's use.
ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
@ -95,10 +95,10 @@ STATIC_O = o
## Versioned libraries rules
%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO)
$(RM) $@ && ln -s $*$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) $@
%.$(SO): %$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO)
$(RM) $@ && ln -s $*$(SO_TARGET_VERSION)$(ICULIBSUFFIX).$(SO) $@
%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
%.$(SO): %$(SO_TARGET_VERSION).$(SO)
$(RM) $@ && ln -s $*$(SO_TARGET_VERSION).$(SO) $@
## BIR - bind with internal references [so app data and icu data doesn't collide]