Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Side by Side Diff: source/config/mh-os390

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « source/config/mh-msys-msvc ('k') | source/config/mh-solaris-gcc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## -*-makefile-*- 1 ## -*-makefile-*-
2 ## os/390, z/OS specific setup 2 ## os/390, z/OS specific setup
3 ## Copyright (c) 1999-2013, International Business Machines Corporation and 3 ## Copyright (c) 1999-2014, International Business Machines Corporation and
4 ## others. All Rights Reserved. 4 ## others. All Rights Reserved.
5 5
6 ################################################################### 6 ###################################################################
7 # IMPORTANT NOTE # 7 # IMPORTANT NOTE #
8 ################################################################### 8 ###################################################################
9 # Before you try to run the Makefile, make sure you have the # 9 # Before you try to run the Makefile, make sure you have the #
10 # environment variables set. # 10 # environment variables set. #
11 # # 11 # #
12 # If you are going to do the OS390BATCH build, make sure you have # 12 # If you are going to do the OS390BATCH build, make sure you have #
13 # the OS390BATCH environment variable set. # 13 # the OS390BATCH environment variable set. #
(...skipping 21 matching lines...) Expand all
35 # # 35 # #
36 ################################################################### 36 ###################################################################
37 37
38 # TODO: Fix this configuration so that icu-config will work! 38 # TODO: Fix this configuration so that icu-config will work!
39 # If statements don't work well when icu-config is generated. 39 # If statements don't work well when icu-config is generated.
40 ifeq (${IEEE390},) 40 ifeq (${IEEE390},)
41 IEEE390=1#M# 41 IEEE390=1#M#
42 endif 42 endif
43 43
44 ifeq (${IEEE390}, 1) 44 ifeq (${IEEE390}, 1)
45 ICU_IEEE = -Wc,'FLOAT(IEEE)' -DIEEE_754=0#M#
46 else
45 ICU_IEEE =#M# 47 ICU_IEEE =#M#
46 else
47 ICU_IEEE = -Wc,'FLOAT(IEEE)' -DIEEE_754=0#M#
48 endif 48 endif
49 49
50 ## Additional flags when building libraries and with threads 50 ## Additional flags when building libraries and with threads
51 THREADSCPPFLAGS = -D_OPEN_THREADS 51 THREADSCPPFLAGS = -D_OPEN_THREADS=3
52 52
53 # For a dynamically called DLL module to share access to the POSIX external 53 # For a dynamically called DLL module to share access to the POSIX external
54 # variables, with its caller, the DLL module must define these _SHR_* macros. 54 # variables, with its caller, the DLL module must define these _SHR_* macros.
55 SHAREDLIBCPPFLAGS = -D_SHR_TZNAME -D_SHR_TIMEZONE 55 SHAREDLIBCPPFLAGS = -D_SHR_TZNAME -D_SHR_TIMEZONE
56 56
57 # -Wc,expo is used to export all functions 57 # -Wc,expo is used to export all functions
58 SHAREDLIBCFLAGS = -Wc,expo 58 SHAREDLIBCFLAGS = -Wc,expo
59 SHAREDLIBCXXFLAGS = -Wc,expo 59 SHAREDLIBCXXFLAGS = -Wc,expo
60 60
61 # TODO: Consider using -Wc,roc,ros for making the data and strings readonly 61 # TODO: Consider using -Wc,roc,ros for making the data and strings readonly
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 ## Non-shared intermediate object suffix 130 ## Non-shared intermediate object suffix
131 STATIC_O = o 131 STATIC_O = o
132 132
133 ifeq ($(OS390_STUBDATA),1) 133 ifeq ($(OS390_STUBDATA),1)
134 ## Suffix of the subset data library for dual common library support 134 ## Suffix of the subset data library for dual common library support
135 STUB_SUFFIX=_stub#M# 135 STUB_SUFFIX=_stub#M#
136 DEFS += -DOS390_STUBDATA -DU_LIBICUDATA_NAME=\"$(ICUPREFIX)$(DATA_STUBNAME) $(ICULIBSUFFIX)\"#M# 136 DEFS += -DOS390_STUBDATA -DU_LIBICUDATA_NAME=\"$(ICUPREFIX)$(DATA_STUBNAME) $(ICULIBSUFFIX)\"#M#
137 endif 137 endif
138 138
139 ifeq ($(OS390BATCH),1) 139 ifeq ($(OS390BATCH),1)
140 ## PDS_NAME_PREFIX sets the prefix of the PDS dataset name while keeping the ICU version number.
141 ## To use custom names set ICU_PDS_NAME and ICU_PDS_NAME_SUFFIX
140 ## IXM is used as a name prefix for XML Toolkit, default value 142 ## IXM is used as a name prefix for XML Toolkit, default value
141 ifeq ($(PDS_NAME_PREFIX),) 143 ifeq ($(PDS_NAME_PREFIX),)
142 PDS_NAME_PREFIX= IXMI 144 PDS_NAME_PREFIX= IXMI
143 endif 145 endif
146 ifeq ($(ICU_PDS_NAME),)
147 PDS_FULL_NAME=${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}
148 else
149 PDS_FULL_NAME=${ICU_PDS_NAME}
150 endif
144 ifeq ($(OS390_STUBDATA),1) 151 ifeq ($(OS390_STUBDATA),1)
145 BATCH_STUB_TARGET=» "//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}D1)'" 152 BATCH_STUB_TARGET=» "//'${LOADMOD}(${PDS_FULL_NAME}D1${ICU_PDS_NAME_SUFFIX}) '"
146 BATCH_LIBICUDT=»» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}D1)'" 153 BATCH_LIBICUDT=»» "//'${LOADEXP}(${PDS_FULL_NAME}D1${ICU_PDS_NAME_SUFFIX}) '"
147 else 154 else
148 BATCH_STUB_TARGET=» "//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}DA)'" 155 BATCH_STUB_TARGET=» "//'${LOADMOD}(${PDS_FULL_NAME}DA${ICU_PDS_NAME_SUFFIX}) '"
149 BATCH_LIBICUDT=»» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}DA)'" 156 BATCH_LIBICUDT=»» "//'${LOADEXP}(${PDS_FULL_NAME}DA${ICU_PDS_NAME_SUFFIX}) '"
150 PKGDATA_DEFS += -DU_LIBICUDATA_NAME=\"$(ICUPREFIX)$(DATA_STUBNAME)$(ICULI BSUFFIX)\" 157 PKGDATA_DEFS += -DU_LIBICUDATA_NAME=\"$(ICUPREFIX)$(DATA_STUBNAME)$(ICULI BSUFFIX)\"
151 endif 158 endif
152 159
153 BATCH_COMMON_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}U C)'" 160 BATCH_COMMON_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}UC${ICU_PDS_NAME_SUFFIX})'"
154 BATCH_I18N_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}IN) '" 161 BATCH_I18N_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}IN${ICU_PDS_NAME_SUFFIX})'"
155 BATCH_IO_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}IO)'" 162 BATCH_IO_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}IO${ICU_PDS_NAME_SUFFIX})'"
156 BATCH_LAYOUT_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR}L E)'" 163 BATCH_LAYOUT_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}LE${ICU_PDS_NAME_SUFFIX})'"
157 BATCH_LAYOUTEX_TARGET="//'${LOADMOD}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJOR }LX)'" 164 BATCH_LAYOUTEX_TARGET="//'${LOADMOD}(${PDS_FULL_NAME}LX${ICU_PDS_NAME_SUFFIX})'"
158 165
159 BATCH_LIBICUUC=»» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}UC)'" 166 BATCH_LIBICUUC=»» "//'${LOADEXP}(${PDS_FULL_NAME}UC${ICU_PDS_NAME_SUFFIX}) '"
160 BATCH_LIBICUI18N=» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}IN)'" 167 BATCH_LIBICUI18N=» "//'${LOADEXP}(${PDS_FULL_NAME}IN${ICU_PDS_NAME_SUFFIX}) '"
161 BATCH_LIBICUIO=»» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}IO)'" 168 BATCH_LIBICUIO=»» "//'${LOADEXP}(${PDS_FULL_NAME}IO${ICU_PDS_NAME_SUFFIX}) '"
162 BATCH_LIBICULE=»» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}LE)'" 169 BATCH_LIBICULE=»» "//'${LOADEXP}(${PDS_FULL_NAME}LE${ICU_PDS_NAME_SUFFIX}) '"
163 BATCH_LIBICULX=»» "//'${LOADEXP}(${PDS_NAME_PREFIX}${SO_TARGET_VERSION_MAJ OR}LX)'" 170 BATCH_LIBICULX=»» "//'${LOADEXP}(${PDS_FULL_NAME}LX${ICU_PDS_NAME_SUFFIX}) '"
164 endif 171 endif
165 172
166 173
167 ## Link commands to link to ICU libs 174 ## Link commands to link to ICU libs
168 LIBICUDT= $(top_builddir)/stubdata/$(LIBICU)data$(ICULIBSUFFIX)$(STUB_SUFF IX)$(SO_TARGET_VERSION).x 175 LIBICUDT= $(top_builddir)/stubdata/$(LIBICU)data$(ICULIBSUFFIX)$(STUB_SUFF IX)$(SO_TARGET_VERSION).x
169 LIBICUUC= $(top_builddir)/common/$(LIBICU)uc$(ICULIBSUFFIX)$(SO_TARGET_VER SION).x 176 LIBICUUC= $(top_builddir)/common/$(LIBICU)uc$(ICULIBSUFFIX)$(SO_TARGET_VER SION).x
170 LIBICUI18N= $(top_builddir)/i18n/$(LIBICU)i18n$(ICULIBSUFFIX)$(SO_TARGET_VER SION).x 177 LIBICUI18N= $(top_builddir)/i18n/$(LIBICU)i18n$(ICULIBSUFFIX)$(SO_TARGET_VER SION).x
171 LIBICULE= $(top_builddir)/layout/$(LIBICU)le$(ICULIBSUFFIX)$(SO_TARGET_VER SION).x 178 LIBICULE= $(top_builddir)/layout/$(LIBICU)le$(ICULIBSUFFIX)$(SO_TARGET_VER SION).x
172 LIBICULX= $(top_builddir)/layoutex/$(LIBICU)lx$(ICULIBSUFFIX)$(SO_TARGET_V ERSION).x 179 LIBICULX= $(top_builddir)/layoutex/$(LIBICU)lx$(ICULIBSUFFIX)$(SO_TARGET_V ERSION).x
173 LIBICUIO= $(top_builddir)/io/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION ).x 180 LIBICUIO= $(top_builddir)/io/$(LIBICU)io$(ICULIBSUFFIX)$(SO_TARGET_VERSION ).x
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 ## Versioned libraries rules 231 ## Versioned libraries rules
225 %$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) 232 %$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
226 $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ 233 $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
227 %.$(SO): %$(SO_TARGET_VERSION).$(SO) 234 %.$(SO): %$(SO_TARGET_VERSION).$(SO)
228 $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ 235 $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
229 236
230 ## Install libraries as executable 237 ## Install libraries as executable
231 INSTALL-L=$(INSTALL_PROGRAM) 238 INSTALL-L=$(INSTALL_PROGRAM)
232 239
233 ## End 390-specific setup 240 ## End 390-specific setup
OLDNEW
« no previous file with comments | « source/config/mh-msys-msvc ('k') | source/config/mh-solaris-gcc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698