mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-14 17:24:01 +00:00
ICU-8772 patch looks reasonable, had tested it on r1a3 with good success
X-SVN-Rev: 31443
This commit is contained in:
Steven R. Loomis
parent
05b2ae1381
commit
3b47d3fee3
2 changed files with 78 additions and 76 deletions
1
.gitattributes
vendored
1
.gitattributes
vendored
|
|
@ -52,7 +52,6 @@ icu4c/icu4c.css -text
|
|||
icu4c/source/allinone/icucheck.bat -text
|
||||
icu4c/source/common/common.vcxproj -text
|
||||
icu4c/source/common/common.vcxproj.filters -text
|
||||
icu4c/source/config/mh-haiku -text
|
||||
icu4c/source/data/curr/pool.res -text
|
||||
icu4c/source/data/in/coll/invuca.icu -text
|
||||
icu4c/source/data/in/coll/ucadata.icu -text
|
||||
|
|
|
|||
|
|
@ -1,75 +1,78 @@
|
|||
## -*-makefile-*-
|
||||
## haiku-specific setup
|
||||
## Copyright (c) 2010, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -fPIC
|
||||
SHAREDLIBCXXFLAGS = -fPIC
|
||||
SHAREDLIBCPPFLAGS = -DPIC
|
||||
|
||||
## Additional flags when building libraries and with threads
|
||||
LIBCPPFLAGS =
|
||||
THREADSCPPFLAGS =
|
||||
|
||||
## Compiler switch to embed a runtime search path
|
||||
LD_RPATH=
|
||||
LD_RPATH_PRE = -Wl,-rpath,
|
||||
|
||||
## Compiler switch to embed a library name
|
||||
LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
|
||||
|
||||
## Shared object suffix
|
||||
SO = so
|
||||
## Non-shared intermediate object suffix
|
||||
STATIC_O = ao
|
||||
|
||||
## Compilation rules
|
||||
%.$(STATIC_O): $(srcdir)/%.c
|
||||
$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
|
||||
%.o: $(srcdir)/%.c
|
||||
$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
|
||||
|
||||
%.$(STATIC_O): $(srcdir)/%.cpp
|
||||
$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
|
||||
%.o: $(srcdir)/%.cpp
|
||||
$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
|
||||
|
||||
|
||||
## Dependency rules
|
||||
%.d: $(srcdir)/%.c
|
||||
@echo "generating dependency information for $<"
|
||||
@$(SHELL) -ec '$(GEN_DEPS.c) $< \
|
||||
| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
|
||||
[ -s $@ ] || rm -f $@'
|
||||
|
||||
%.d: $(srcdir)/%.cpp
|
||||
@echo "generating dependency information for $<"
|
||||
@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
|
||||
| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
|
||||
[ -s $@ ] || rm -f $@'
|
||||
|
||||
## Versioned libraries rules
|
||||
|
||||
%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
|
||||
$(RM) $@ && ln -s ${<F} $@
|
||||
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
|
||||
$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
|
||||
|
||||
## Bind internal references
|
||||
|
||||
# LDflags that pkgdata will use
|
||||
BIR_LDFLAGS= -Wl,-Bsymbolic
|
||||
|
||||
# Dependencies [i.e. map files] for the final library
|
||||
BIR_DEPS=
|
||||
|
||||
# Use LIBRARY_PATH instead of LD_LIBRARY_PATH
|
||||
LDLIBRARYPATH_ENVVAR= LIBRARY_PATH
|
||||
|
||||
## End haiku-specific setup
|
||||
## -*-makefile-*-
|
||||
## haiku-specific setup
|
||||
## Copyright (c) 2010-2012, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -fPIC
|
||||
SHAREDLIBCXXFLAGS = -fPIC
|
||||
SHAREDLIBCPPFLAGS = -DPIC
|
||||
|
||||
## Additional flags when building libraries and with threads
|
||||
LIBCPPFLAGS =
|
||||
THREADSCPPFLAGS =
|
||||
|
||||
#
|
||||
CPPFLAGS += -D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1
|
||||
|
||||
## Compiler switch to embed a runtime search path
|
||||
LD_RPATH=
|
||||
LD_RPATH_PRE = -Wl,-rpath,
|
||||
|
||||
## Compiler switch to embed a library name
|
||||
LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
|
||||
|
||||
## Shared object suffix
|
||||
SO = so
|
||||
## Non-shared intermediate object suffix
|
||||
STATIC_O = ao
|
||||
|
||||
## Compilation rules
|
||||
%.$(STATIC_O): $(srcdir)/%.c
|
||||
$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
|
||||
%.o: $(srcdir)/%.c
|
||||
$(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
|
||||
|
||||
%.$(STATIC_O): $(srcdir)/%.cpp
|
||||
$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
|
||||
%.o: $(srcdir)/%.cpp
|
||||
$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
|
||||
|
||||
|
||||
## Dependency rules
|
||||
%.d: $(srcdir)/%.c
|
||||
@echo "generating dependency information for $<"
|
||||
@$(SHELL) -ec '$(GEN_DEPS.c) $< \
|
||||
| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
|
||||
[ -s $@ ] || rm -f $@'
|
||||
|
||||
%.d: $(srcdir)/%.cpp
|
||||
@echo "generating dependency information for $<"
|
||||
@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
|
||||
| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
|
||||
[ -s $@ ] || rm -f $@'
|
||||
|
||||
## Versioned libraries rules
|
||||
|
||||
%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
|
||||
$(RM) $@ && ln -s ${<F} $@
|
||||
%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
|
||||
$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
|
||||
|
||||
## Bind internal references
|
||||
|
||||
# LDflags that pkgdata will use
|
||||
BIR_LDFLAGS= -Wl,-Bsymbolic
|
||||
|
||||
# Dependencies [i.e. map files] for the final library
|
||||
BIR_DEPS=
|
||||
|
||||
# Use LIBRARY_PATH instead of LD_LIBRARY_PATH
|
||||
LDLIBRARYPATH_ENVVAR= LIBRARY_PATH
|
||||
|
||||
## End haiku-specific setup
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue