From 42ab05496b276e04106ff86f061a6b4e9cc32aec Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 12 2020 01:09:39 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/source/config/Makefile.inc.in b/source/config/Makefile.inc.in index 28816c5..9ee94dd 100644 --- a/source/config/Makefile.inc.in +++ b/source/config/Makefile.inc.in @@ -41,7 +41,7 @@ UNICODE_VERSION = @UNICODE_VERSION@ # The prefix for ICU libraries, normally 'icu' ICUPREFIX = icu PACKAGE = @PACKAGE@ -LIBICU = $(ICUPREFIX) +LIBICU = lib$(ICUPREFIX) # Static library prefix and file extension STATIC_PREFIX = s @@ -106,19 +106,18 @@ CTESTFW_STUBNAME = test # - $(ICULIBS_LAYOUT) - ICU layout library. # - $(ICULIBS_ICUIO) - ICU stdio equivalent library -ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX) -ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX) -ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX) -ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX) -ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX) -ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX) -ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX) -ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX) -ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX) +ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) +ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) ICULIBS_BASE = -L$(libdir) # for icu-config to test with -SO = dll ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO} ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A} diff --git a/source/config/Makefile.inc.in.crossbuild b/source/config/Makefile.inc.in.crossbuild deleted file mode 100644 index 9ee94dd..0000000 --- a/source/config/Makefile.inc.in.crossbuild +++ /dev/null @@ -1,293 +0,0 @@ -## -*-makefile-*- -#****************************************************************************** -# Copyright (C) 1999-2014, International Business Machines -# Corporation and others. All Rights Reserved. -#****************************************************************************** -# This Makefile.inc is designed to be included into projects which make use -# of the ICU. - -# CONTENTS OF THIS FILE -# 1). Base configuration information and linkage -# 2). Variables giving access to ICU tools -# 3). Host information -# 4). Compiler flags and settings -# 5). Data Packaging directives -# 6). Include of platform make fragment (mh-* file) - -################################################################## -################################################################## -# -# *1* base configuration information and linkage -# -################################################################## -# The PREFIX is the base of where ICU is installed. -# Inside this directory you should find bin, lib, include/unicode, -# etc. If ICU is not installed in this directory, you must change the -# following line. There should exist $(prefix)/include/unicode/utypes.h -# for example. -prefix = @prefix@ -exec_prefix = @exec_prefix@ -libdir = @libdir@ -libexecdir = @libexecdir@ -bindir = @bindir@ -datarootdir = @datarootdir@ -datadir = @datadir@ -sbindir = @sbindir@ - -# about the ICU version -VERSION = @VERSION@ -UNICODE_VERSION = @UNICODE_VERSION@ - -# The prefix for ICU libraries, normally 'icu' -ICUPREFIX = icu -PACKAGE = @PACKAGE@ -LIBICU = lib$(ICUPREFIX) - -# Static library prefix and file extension -STATIC_PREFIX = s -LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX) -A = a - -# Suffix at the end of libraries. Usually empty. -ICULIBSUFFIX = @ICULIBSUFFIX@ -# ICULIBSUFFIX_VERSION is non-empty if it is to contain a library -# version. For example, if it is 21, it means libraries are named -# libicuuc21.so for example. - -# rpath links a library search path right into the binaries. -## mh-files MUST NOT override RPATHLDFLAGS unless they provide -## equivalent '#SH#' lines for icu-config fixup -ENABLE_RPATH = @ENABLE_RPATH@ -ifeq ($(ENABLE_RPATH),YES) -RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) -endif - -#SH## icu-config version of above 'if': -#SH#case "x$ENABLE_RPATH" in -#SH# x[yY]*) -#SH# ENABLE_RPATH=YES -#SH# RPATHLDFLAGS="${LD_RPATH}${LD_RPATH_PRE}${libdir}" -#SH# ;; -#SH# -#SH# x[nN]*) -#SH# ENABLE_RPATH=NO -#SH# RPATHLDFLAGS="" -#SH# ;; -#SH# -#SH# x) -#SH# ENABLE_RPATH=NO -#SH# RPATHLDFLAGS="" -#SH# ;; -#SH# -#SH# *) -#SH# echo $0: Unknown --enable-rpath value ${ENABLE_RPATH} 1>&2 -#SH# exit 3 -#SH# ;; -#SH#esac - -# Name flexibility for the library naming scheme. Any modifications should -# be made in the mh- file for the specific platform. -DATA_STUBNAME = data -COMMON_STUBNAME = uc -I18N_STUBNAME = i18n -LAYOUT_STUBNAME = le -LAYOUTEX_STUBNAME = lx -IO_STUBNAME = io -TOOLUTIL_STUBNAME = tu -CTESTFW_STUBNAME = test - - - -### To link your application with ICU: -# 1. use LDFLAGS, CFLAGS, etc from above -# 2. link with $(ICULIBS) -# 3. optionally, add one or more of: -# - $(ICULIBS_I18N) - i18n library, formatting, etc. -# - $(ICULIBS_LAYOUT) - ICU layout library. -# - $(ICULIBS_ICUIO) - ICU stdio equivalent library - -ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) -ICULIBS_BASE = -L$(libdir) - -# for icu-config to test with -ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO} -ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A} - -# ICULIBS is the set of libraries your application should link -# with usually. Many applications will want to add $(ICULIBS_I18N) as well. -ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) - -# Proper echo newline handling is needed in icu-config -ECHO_N=@ICU_ECHO_N@ -ECHO_C=@ICU_ECHO_C@ -# Not currently being used but good to have for proper tab handling -ECHO_T=@ICU_ECHO_T@ - -################################################################## -################################################################## -# -# *2* access to ICU tools -# -################################################################## -# Environment variable to set a runtime search path -# (Overridden when necessary in -mh files) -LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH - -# Versioned target for a shared library -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - -# Access to important ICU tools. -# Use as follows: $(INVOKE) $(GENRB) arguments .. -INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER) -GENCCODE = $(sbindir)/genccode -ICUPKG = $(sbindir)/icupkg -GENCMN = $(sbindir)/gencmn -GENRB = $(bindir)/genrb -PKGDATA = $(bindir)/pkgdata - -# moved here because of dependencies -pkgdatadir = $(datadir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION) -pkglibdir = $(libdir)/$(PACKAGE)$(ICULIBSUFFIX)/$(VERSION) - -################################################################## -################################################################## -# -# *3* Information about the host -# -################################################################## - -# Information about the host that 'configure' was run on. -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_vendor = @host_vendor@ -host_os = @host_os@ -# Our platform canonical name (as determined by configure) -# this is a #define value (i.e. U_XXXX or XXXX) -platform = @platform@ - -################################################################## -################################################################## -# -# *4* compiler flags and misc. options -# -################################################################## -AR = @AR@ -# initial tab keeps it out of the shell version. - ARFLAGS := @ARFLAGS@ $(ARFLAGS) -#SH#ARFLAGS="@ARFLAGS@ ${ARFLAGS}" -CC = @CC@ -CPP = @CPP@ -CFLAGS = @UCONFIG_CFLAGS@ -CPPFLAGS = @UCONFIG_CPPFLAGS@ -I$(prefix)/include -CXXFLAGS = @UCONFIG_CXXFLAGS@ -CXX = @CXX@ -DEFAULT_MODE = @DATA_PACKAGING_MODE@ -DEFS = @DEFS@ -# use a consistent INSTALL -INSTALL = $(SHELL) $(pkgdatadir)/install-sh -c -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -LDFLAGS = $(RPATHLDFLAGS) -LIBS = @LIBS@ -LIB_M = @LIB_M@ -LIB_VERSION = @LIB_VERSION@ -LIB_VERSION_MAJOR = @LIB_VERSION_MAJOR@ -MKINSTALLDIRS = $(SHELL) $(pkgdatadir)/mkinstalldirs -RANLIB = @RANLIB@ -RMV = rm -rf -SHELL = @SHELL@ -SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared -U_IS_BIG_ENDIAN = @U_IS_BIG_ENDIAN@ -includedir = @includedir@ -infodir = @infodir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -oldincludedir = @oldincludedir@ -program_transform_name = @program_transform_name@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -INSTALL-L = ${INSTALL_DATA} - -# for derivative builds - don't bother with VERBOSE/NONVERBOSE SILENT_COMPILE -SILENT_COMPILE=$(1) #M# -ICU_MSG=@echo " $(1) " #M# - -################################################################## -################################################################## -# -# *5* packaging options and directories -# -################################################################## - - -# The basename of the ICU data file (i.e. icudt21b ) -ICUDATA_CHAR = @ICUDATA_CHAR@ -ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ - -# Defaults for pkgdata's mode and directories -# The default data dir changes depending on what packaging mode -# is being used -ifeq ($(strip $(PKGDATA_MODE)),) -#SH# if [ "x$PKGDATA_MODE" = "x" ]; -#SH# then -PKGDATA_MODE=@DATA_PACKAGING_MODE@ -#SH# fi -endif - -#SH# case "$PKGDATA_MODE" in -ifeq ($(PKGDATA_MODE),common) -#SH# common) -ICUDATA_DIR = $(pkgdatadir) -ICUPKGDATA_DIR = $(ICUDATA_DIR) -#SH# ;; -else -ifeq ($(PKGDATA_MODE),dll) -#SH# dll) -ICUDATA_DIR = $(pkgdatadir) -ICUPKGDATA_DIR = $(libdir) -#SH# ;; -else -#SH# *) -ICUDATA_DIR = $(pkgdatadir) -ICUPKGDATA_DIR = $(ICUDATA_DIR) -#SH# ;; -endif -endif - -#SH# esac - -GENCCODE_ASSEMBLY = @GENCCODE_ASSEMBLY@ - -################################################################## -################################################################## -# -# *6* Inclusion of platform make fragment (mh-* file) -# -################################################################## -# The mh- file ("make fragment") for the platform is included here. -# It may override the above settings. -# It is put last so that the mh-file can override anything. -# The selfcheck is just a sanity check that this makefile is -# parseable. The mh fragment is only included if this does not occur. - -ifeq (selfcheck,$(MAKECMDGOALS)) #M# -selfcheck: #M# - @echo passed #M# -else #M# -include $(pkgdatadir)/config/@platform_make_fragment_name@ -endif #M# - diff --git a/source/config/icu-config-bottom b/source/config/icu-config-bottom index f5846b7..8a89c14 100644 --- a/source/config/icu-config-bottom +++ b/source/config/icu-config-bottom @@ -3,7 +3,7 @@ ## Copyright (c) 2002-2013, International Business Machines Corporation and ## others. All Rights Reserved. -ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}" +ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}" ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}" # echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS} diff --git a/source/config/icu-config-bottom.crossbuild b/source/config/icu-config-bottom.crossbuild deleted file mode 100644 index 8a89c14..0000000 --- a/source/config/icu-config-bottom.crossbuild +++ /dev/null @@ -1,411 +0,0 @@ -## -*-sh-*- -## BEGIN of icu-config-bottom. -## Copyright (c) 2002-2013, International Business Machines Corporation and -## others. All Rights Reserved. - -ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}" -ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}" - -# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS} -if [ "x$PKGDATA_MODE" = "x" ]; then - PKGDATA_MODE=dll -fi - -} - -## The actual code of icu-config goes here. - -ME=`basename "$0"` - -allflags() -{ - echo " --noverify Don't verify that ICU is actually installed." - echo " --bindir Print binary directory path (bin)" - echo " --cc Print C compiler used [CC]" - echo " --cflags Print C compiler flags [CFLAGS]" - echo " --cflags-dynamic Print additional C flags for" - echo " building shared libraries." - echo " --cppflags Print C Preprocessor flags [CPPFLAGS]" - echo " --cppflags-dynamic Print additional C Preprocessor flags for" - echo " building shared libraries." - echo " --cppflags-searchpath Print only -I include directives (-Iinclude)" - echo " --cxx Print C++ compiler used [CXX]" - echo " --cxxflags Print C++ compiler flags [CXXFLAGS]" - echo " --cxxflags-dynamic Print additional C++ flags for" - echo " building shared libraries." - echo " --detect-prefix Attempt to detect prefix based on PATH" - echo " --exec-prefix Print prefix for executables (/bin)" - echo " --exists Return with 0 status if ICU exists else fail" - echo " --help, -?, --usage Print this message" - echo " --icudata Print shortname of ICU data file (icudt21l)" - echo " --icudata-install-dir Print path to install data to - use as --install option to pkgdata(1)" - echo " --icudata-mode Print default ICU pkgdata mode (dll) - use as --mode option to pkgdata(1)." - echo " --icudatadir Print path to packaged archive data. Can set as [ICU_DATA]" - echo " --invoke Print commands to invoke an ICU program" - echo " --invoke= Print commands to invoke an ICU program named (ex: genrb)" - echo " --ldflags Print -L search path and -l libraries to link with ICU [LDFLAGS]. This is for the data, uc (common), and i18n libraries only. " - echo " --ldflags-layout Print ICU layout engine link directive. Use in addition to --ldflags" - echo " --ldflags-libsonly Same as --ldflags, but only the -l directives" - echo " --ldflags-searchpath Print only -L (search path) directive" - echo " --ldflags-system Print only system libs ICU links with (-lpthread, -lm)" - echo " --ldflags-icuio Print ICU icuio link directive. Use in addition to --ldflags " - echo " --ldflags-obsolete Print ICU obsolete link directive. Use in addition to --ldflags. (requires icuapps/obsolete to be built and installed.) " - echo " --mandir Print manpage (man) path" - echo " --prefix Print PREFIX to icu install (/usr/local)" - echo " --prefix=XXX Set prefix to XXX for remainder of command" - echo " --sbindir Print system binary path (sbin) " - echo " --shared-datadir Print shared data (share) path. This is NOT the ICU data dir." - echo " --shlib-c Print the command to compile and build C shared libraries with ICU" - echo " --shlib-cc Print the command to compile and build C++ shared libraries with ICU" - echo " --sysconfdir Print system config (etc) path" - echo " --unicode-version Print version of Unicode data used in ICU ($UNICODE_VERSION)" - echo " --version Print ICU version ($VERSION)" - echo " --incfile Print path to Makefile.inc" - echo " --incpkgdatafile Print path to pkgdata.inc (for -O option of pkgdata)" - echo " --install Print path to install-sh" - echo " --mkinstalldirs Print path to mkinstalldirs" -} - -## Print the normal usage message -shortusage() -{ - echo "usage: ${ME} " `allflags | cut -c-25 | sed -e 's%.*%[ & ]%'` -} - - -usage() -{ - echo "${ME}: icu-config: ICU configuration helper script" - echo - echo "The most commonly used options will be --cflags, --cxxflags, --cppflags, and --ldflags." - echo 'Example (in make): CPFLAGS=$(shell icu-config --cppflags)' - echo ' LDFLAGS=$(shell icu-config --ldflags)' - echo " (etc).." - echo - echo "Usage:" - allflags - - echo - echo " [Brackets] show MAKE variable equivalents, (parenthesis) show example output" - echo - echo "Copyright (c) 2002-2013, International Business Machines Corporation and others. All Rights Reserved." - echo - echo "NOTE: Please consider using the pkg-config (.pc) files instead of icu-config." - echo " See: " -} - -## Check the sanity of current variables -sanity() -{ - if [ ! -f "${ICUUC_FILE}" -a ! -f "${ICUUC_FILE_A}" ] && [ ${IGNORE_ICUUC_FILE_CHECK} = "no" ] && [ ${SANITY} = "sane" ]; - then - echo "### $ME: Can't find ${ICUUC_FILE} - ICU prefix is wrong." 1>&2 - echo "### Try the --prefix= option " 1>&2 - echo "### or --detect-prefix" 1>&2 - echo "### (If you want to disable this check, use the --noverify option)" 1>&2 - echo "### $ME: Exitting." 1>&2 - exit 2 - fi -} - -## Main starts here. - -if [ $# -lt 1 ]; then - shortusage - exit 1 -fi - -# For certain options (e.g. --detect-prefix) don't check for icuuc library file. - -IGNORE_ICUUC_FILE_CHECK="no"; - -SANITY="sane" - -case "$1" in ---noverify) - SANITY="nosanity" - shift - ;; -esac - -case "$1" in -*prefix*) - IGNORE_ICUUC_FILE_CHECK="yes" - ;; -esac - -# Load our variables from autoconf -# ALWAYS load twice because of dependencies -loaddefs -loaddefs - -if [ $# -gt 0 -a $1 = "--selfcheck" ]; -then - echo "passed" - exit - # EXIT for self check -fi - -sanity - -while [ $# -gt 0 ]; -do - arg="$1" - var=`echo $arg | sed -e 's/^[^=]*=//'` -# echo "### processing $arg" 1>&2 - case "$arg" in - - # undocumented. - --debug) - set -x - ;; - - --noverify) - echo "### $ME: Error: --noverify must be the first argument." 1>&2 - exit 1 - ;; - - --so) - echo $SO - ;; - - --bindir) - echo $bindir - ;; - - --libdir) - echo $libdir - ;; - - --exists) - sanity - ;; - - --sbindir) - echo $sbindir - ;; - - --mkinstalldirs) - echo ${MKINSTALLDIRS} - ;; - - --install) - echo ${INSTALL} - ;; - - --invoke=*) - QUOT="\"" - CMD="${var}" - - # If it's not a locally executable command (1st choice) then - # search for it in the ICU directories. - if [ ! -x ${CMD} ]; then - if [ -x ${bindir}/${var} ]; then - CMD="${bindir}/${var}" - fi - if [ -x ${sbindir}/${var} ]; then - CMD="${sbindir}/${var}" - fi - fi - - echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT} ${CMD} - ;; - - --invoke) - QUOT="\"" - echo "env ${QUOT}${LDLIBRARYPATH_ENVVAR}=${libdir}:"'${'"${LDLIBRARYPATH_ENVVAR}"'}'${QUOT} - ;; - - --cflags) - echo $ECHO_N "${CFLAGS} ${ECHO_C}" - ;; - - --cc) - echo $ECHO_N "${CC} ${ECHO_C}" - ;; - - --cxx) - echo $ECHO_N "${CXX} ${ECHO_C}" - ;; - - --cxxflags) - echo $ECHO_N "${CXXFLAGS} ${ECHO_C}" - ;; - - --cppflags) - # Don't echo the -I. - it's unneeded. - echo $ECHO_N "${CPPFLAGS} ${ECHO_C}" | sed -e 's/-I. //' - ;; - - --cppflags-searchpath) - echo $ECHO_N "-I${prefix}/include ${ECHO_C}" - ;; - - --cppflags-dynamic) - echo $ECHO_N "${SHAREDLIBCPPFLAGS} ${ECHO_C}" - ;; - - --cxxflags-dynamic) - echo $ECHO_N "${SHAREDLIBCXXFLAGS} ${ECHO_C}" - ;; - - --cflags-dynamic) - echo $ECHO_N "${SHAREDLIBCFLAGS} ${ECHO_C}" - ;; - - --ldflags-system) - echo $ECHO_N "${LIBS} ${ECHO_C}" - ;; - - --ldflags) - echo $ECHO_N "${LDFLAGS} ${ICULIBS} ${ECHO_C}" -# $RPATH_LDFLAGS - ;; - - --ldflags-libsonly) - echo $ECHO_N "${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} ${ECHO_C}" - ;; - - --ldflags-icuio) - echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}" - ;; - - --ldflags-obsolete) - echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}" - ;; - - --ldflags-toolutil) - echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}" - ;; - - --ldflags-layout) - echo $ECHO_N "${ICULIBS_LAYOUT} ${ICULIBS_LAYOUTEX} ${ECHO_C}" - ;; - - --ldflags-searchpath) - echo $ECHO_N "-L${libdir} ${ECHO_C}" - ;; - - --detect-prefix) - HERE=`echo $0 | sed -e "s/$ME//g"` - if [ -f "${HERE}/../lib/${ICULIBS_COMMON_LIB_NAME}" -o -f "${HERE}/../lib/${ICULIBS_COMMON_LIB_NAME_A}" ]; then - prefix="${HERE}/.." - echo "## Using --prefix=${prefix}" 1>&2 - fi - loaddefs - loaddefs - ;; - - --exec-prefix) - echo $exec_prefix - ;; - - --prefix) - echo $prefix - ;; - - --prefix=*) - prefix=$var - loaddefs - loaddefs - ;; - - --sysconfdir) - echo $sysconfdir - ;; - - --mandir) - echo $mandir - ;; - - --shared-datadir) - echo $ECHO_N "${datadir} ${ECHO_C}" - ;; - - --incfile) - echo $ECHO_N "${pkglibdir}/Makefile.inc ${ECHO_C}" - ;; - - --incpkgdatafile) - echo $ECHO_N "${pkglibdir}/pkgdata.inc ${ECHO_C}" - ;; - - --icudata) - echo $ECHO_N "${ICUDATA_NAME} ${ECHO_C}" - ;; - - --icudata-mode) - echo $ECHO_N "${PKGDATA_MODE} ${ECHO_C}" - ;; - - --icudata-install-dir) - echo $ECHO_N "${ICUPKGDATA_DIR} ${ECHO_C}" - ;; - - --icudatadir) - echo $ECHO_N "${ICUDATA_DIR} ${ECHO_C}" - ;; - - --shlib-c) - echo $ECHO_N "${SHLIB_c} ${ECHO_C}" - ;; - - --shlib-cc) - echo $ECHO_N "${SHLIB_cc} ${ECHO_C}" - ;; - - --version) - echo $ECHO_N $VERSION - ;; - - --unicode-version) - echo $ECHO_N $UNICODE_VERSION - ;; - - --host) - echo $host - exit 0 - ;; - - --help) - usage - exit 0 - ;; - - --usage) - usage - exit 0 - ;; - -# --enable-rpath=*) -# ENABLE_RPATH=$var -# loaddefs -# ;; - - -?) - usage - exit 0 - ;; - - *) - echo ${ME}: ERROR Unknown Option $arg 1>&2 - echo 1>&2 - shortusage 1>&2 - echo "### $ME: Exitting." 1>&2 - exit 1; - ;; - esac - shift - - # Reset the ignore icuuc file check flag - if [ $IGNORE_ICUUC_FILE_CHECK = "yes" ]; then - IGNORE_ICUUC_FILE_CHECK="no" - sanity - fi -done -echo -# Check once before we quit (will check last used prefix) -sanity -## END of icu-config-bottom - -exit 0 diff --git a/source/config/icu.pc.in b/source/config/icu.pc.in index 883f485..187b4d1 100644 --- a/source/config/icu.pc.in +++ b/source/config/icu.pc.in @@ -1,30 +1,30 @@ # Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved. # CFLAGS contains only anything end users should set -CFLAGS=@UCONFIG_CFLAGS@ +CFLAGS = @UCONFIG_CFLAGS@ # CXXFLAGS contains only anything end users should set -CXXFLAGS=@UCONFIG_CXXFLAGS@ +CXXFLAGS = @UCONFIG_CXXFLAGS@ # DEFS only contains those UCONFIG_CPPFLAGS which are not auto-set by platform.h -DEFS=@UCONFIG_CPPFLAGS@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -#bindir=@bindir@ -libdir=@libdir@ -includedir=@includedir@ -baselibs=@LIBS@ -#datarootdir=@datarootdir@ -#datadir=@datadir@ -#sbindir=@sbindir@ -#mandir=@mandir@ -#sysconfdir=@sysconfdir@ +DEFS = @UCONFIG_CPPFLAGS@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +#bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ +baselibs = @LIBS@ +#datarootdir = @datarootdir@ +#datadir = @datadir@ +#sbindir = @sbindir@ +#mandir = @mandir@ +#sysconfdir = @sysconfdir@ UNICODE_VERSION=@UNICODE_VERSION@ ICUPREFIX=icu ICULIBSUFFIX=@ICULIBSUFFIX@ -LIBICU=${ICUPREFIX} +LIBICU=lib${ICUPREFIX} #SHAREDLIBCFLAGS=-fPIC pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ #pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ -ICUDATA_NAME=icudata@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ +ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ #ICUPKGDATA_DIR=@libdir@ #ICUDATA_DIR=${pkgdatadir} ICUDESC=International Components for Unicode diff --git a/source/config/icu.pc.in.crossbuild b/source/config/icu.pc.in.crossbuild deleted file mode 100644 index 187b4d1..0000000 --- a/source/config/icu.pc.in.crossbuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved. - -# CFLAGS contains only anything end users should set -CFLAGS = @UCONFIG_CFLAGS@ -# CXXFLAGS contains only anything end users should set -CXXFLAGS = @UCONFIG_CXXFLAGS@ -# DEFS only contains those UCONFIG_CPPFLAGS which are not auto-set by platform.h -DEFS = @UCONFIG_CPPFLAGS@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -#bindir = @bindir@ -libdir = @libdir@ -includedir = @includedir@ -baselibs = @LIBS@ -#datarootdir = @datarootdir@ -#datadir = @datadir@ -#sbindir = @sbindir@ -#mandir = @mandir@ -#sysconfdir = @sysconfdir@ -UNICODE_VERSION=@UNICODE_VERSION@ -ICUPREFIX=icu -ICULIBSUFFIX=@ICULIBSUFFIX@ -LIBICU=lib${ICUPREFIX} -#SHAREDLIBCFLAGS=-fPIC -pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ -#pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ -ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ -#ICUPKGDATA_DIR=@libdir@ -#ICUDATA_DIR=${pkgdatadir} -ICUDESC=International Components for Unicode - -Version: @VERSION@ -Cflags: -I${includedir} -# end of icu.pc.in diff --git a/source/config/mh-mingw b/source/config/mh-mingw index 7bd7d99..5e6acad 100644 --- a/source/config/mh-mingw +++ b/source/config/mh-mingw @@ -66,7 +66,7 @@ SO_TARGET_VERSION_SUFFIX = endif # Static library prefix and file extension -LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX) +LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) A = a ## An import library is needed for z/OS and MSVC @@ -74,13 +74,20 @@ IMPORT_LIB_EXT = .dll.a LIBPREFIX= -LIBICU = $(ICUPREFIX) +# Change the stubnames so that poorly working FAT disks and installation programs can work. +# This is also for backwards compatibility. +DATA_STUBNAME = dt +I18N_STUBNAME = in +LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) #SH### copied from Makefile.inc #SH## for icu-config to test with #SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}" #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}" +#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" +#SH# #SH## ICULIBS is the set of libraries your application should link #SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well. #SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} " @@ -132,9 +139,6 @@ PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR) #ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M# #ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M# -# The following is for Makefile.inc's use. -ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) - ## Versioned libraries rules #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) # $(RM) $@ && cp ${ $@ - @$(GEN_DEPS.c) $< >> $@ || (rm -f $@ && FALSE) - -%.d: $(srcdir)/%.cpp - @echo "generating dependency information for $<" - @echo -n "$@ " > $@ - @$(GEN_DEPS.cc) $< >> $@ || (rm -f $@ && FALSE) - -## Versioned target for a shared library. -## Since symbolic links don't work the same way on Windows, -## we only use the version major number. -#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) -FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) -MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) - -FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# -IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# -MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# - -## Special pkgdata information that is needed -PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR) -#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M# -#ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M# - -## Versioned libraries rules -#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) -# $(RM) $@ && cp ${ $@ - @$(GEN_DEPS.c) $< >> $@ || (rm -f $@ && FALSE) - -%.d: $(srcdir)/%.cpp - @echo "generating dependency information for $<" - @echo -n "$@ " > $@ - @$(GEN_DEPS.cc) $< >> $@ || (rm -f $@ && FALSE) - -## Versioned target for a shared library. -## Since symbolic links don't work the same way on Windows, -## we only use the version major number. -#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) -FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) -MIDDLE_SO_TARGET=$(FINAL_SO_TARGET) - -FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M# -IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# -MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M# - -## Special pkgdata information that is needed -PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR) -#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M# -#ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M# - -## Versioned libraries rules -#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) -# $(RM) $@ && cp ${