Mercurial Mercurial > upstream > oracle > g11n > g11n-spec / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[mq]: unnecessaryBuildFlags
authorPavel Heimlich <pavel.heimlich@oracle.com>
Mon, 22 Nov 2010 10:03:25 +0100
changeset 47 e214e2c48155
parent 46 bbb379f35dc0
child 48 7554778c8d9f
[mq]: unnecessaryBuildFlags
icu/icu.spec file | annotate | diff | comparison | revisions
icu/patches/source_config_mh-solaris-sparc.patch file | annotate | diff | comparison | revisions
icu/patches/source_config_mh-solaris-x86.patch file | annotate | diff | comparison | revisions
icu/patches/source_configure.patch file | annotate | diff | comparison | revisions 
--- a/icu/icu.spec	Mon Nov 22 09:58:53 2010 +0100
+++ b/icu/icu.spec	Mon Nov 22 10:03:25 2010 +0100
@@ -35,9 +35,7 @@
 #Patch6:  source_common_unicode_utypes.h.patch
 #Patch7:  source_common_unicode_uversion.h.patch
 #Patch8:  source_config_mh-solaris.patch
-Patch6:  source_configure.patch
-Patch7:  source_config_mh-solaris-x86.patch
-Patch8:  source_config_mh-solaris-sparc.patch
+Patch6:  source_config_mh_solaris.patch
 Patch10: source_data_mappings_convrtrs.txt.patch
 Patch11: source_data_mappings_ucmfiles.mk.patch
 Patch12: source_data_misc_zoneinfo.txt.patch
@@ -105,9 +103,9 @@
 #%patch3  -p1
 %patch4  -p1
 %patch5  -p1
+%ifarch sparc
 %patch6  -p1
-%patch7  -p1
-%patch8  -p1
+%endif
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
--- a/icu/patches/source_config_mh-solaris-sparc.patch	Mon Nov 22 09:58:53 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
---- icu/source/config/mh-solaris-sparc.orig	1970-01-01 08:00:00.000000000 +0800
-+++ icu/source/config/mh-solaris-sparc	2009-08-25 11:08:58.180674568 +0800
-@@ -0,0 +1,86 @@
-+## -*-makefile-*-
-+## Solaris-specific setup using Sun's compilers
-+## Copyright (c) 1999-2006, International Business Machines Corporation and
-+## others. All Rights Reserved.
-+
-+## Flags for position independent code
-+## Sun modification:
-+##SHAREDLIBCFLAGS = -KPIC
-+##SHAREDLIBCXXFLAGS = -KPIC
-+##SHAREDLIBCPPFLAGS = -DPIC
-+SHAREDLIBCFLAGS = -KPIC -xregs=no%appl
-+SHAREDLIBCXXFLAGS = -KPIC -xregs=no%appl
-+SHAREDLIBCPPFLAGS = -DPIC -D_REENTRANT
-+
-+## Commands to generate dependency files
-+## Sun modification:
-+##GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS) -xc99=%none
-+GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
-+
-+# -mt means 'compiles and links a multithreaded program'
-+THREADSCFLAGS += -mt
-+THREADSCXXFLAGS += -mt
-+
-+## Commands to link
-+## For Sun Workshop, use CC to link to bring in C++ runtime
-+LINK.c=		$(CXX) $(CXXFLAGS) $(LDFLAGS)
-+LINK.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS)
-+
-+## Commands to make a shared library
-+SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -G
-+SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -G
-+
-+## Compiler switch to embed a runtime search path
-+LD_RPATH=	-R
-+LD_RPATH_PRE=	
-+
-+#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
-+
-+## Compiler switch to embed a library name
-+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
-+
-+## The type of assembly needed when pkgdata is used for generating shared libraries.
-+## Sun modification:
-+GENCCODE_ASSEMBLY=-a sun
-+
-+## Shared object suffix
-+SO=		so
-+## Non-shared intermediate object suffix
-+STATIC_O = o
-+
-+## 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 $<"
-+	@$(GEN_DEPS.c) $< > $@
-+
-+%.d : $(srcdir)/%.cpp
-+	@echo "generating dependency information for $<"
-+	@$(GEN_DEPS.cc) $< > $@
-+
-+## 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) $@
-+
-+# 
-+ifeq (strip $(GENCCODE_ASSEMBLY),)
-+BIR_LDFLAGS=  -Wl,-M,$(NAME).map -Wl,-B,symbolic -Wl,-B,eliminate
-+BIR_DEPS=   $(NAME).map
-+endif
-+
-+## End Solaris-specific setup
--- a/icu/patches/source_config_mh-solaris-x86.patch	Mon Nov 22 09:58:53 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
---- icu/source/config/mh-solaris-x86.orig	1970-01-01 08:00:00.000000000 +0800
-+++ icu/source/config/mh-solaris-x86	2009-08-25 11:09:35.245212347 +0800
-@@ -0,0 +1,86 @@
-+## -*-makefile-*-
-+## Solaris-specific setup using Sun's compilers
-+## Copyright (c) 1999-2006, International Business Machines Corporation and
-+## others. All Rights Reserved.
-+
-+## Flags for position independent code
-+## Sun modification:
-+##SHAREDLIBCFLAGS = -KPIC
-+##SHAREDLIBCXXFLAGS = -KPIC
-+##SHAREDLIBCPPFLAGS = -DPIC
-+SHAREDLIBCFLAGS = -KPIC
-+SHAREDLIBCXXFLAGS = -KPIC
-+SHAREDLIBCPPFLAGS = -DPIC -D_REENTRANT
-+
-+## Commands to generate dependency files
-+## Sun modification:
-+##GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.c=  $(CC) -xM $(DEFS) $(CPPFLAGS) -xc99=%none
-+GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS)
-+
-+# -mt means 'compiles and links a multithreaded program'
-+THREADSCFLAGS += -mt
-+THREADSCXXFLAGS += -mt
-+
-+## Commands to link
-+## For Sun Workshop, use CC to link to bring in C++ runtime
-+LINK.c=		$(CXX) $(CXXFLAGS) $(LDFLAGS)
-+LINK.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS)
-+
-+## Commands to make a shared library
-+SHLIB.c=	$(CC) $(CFLAGS) $(LDFLAGS) -G
-+SHLIB.cc=	$(CXX) $(CXXFLAGS) $(LDFLAGS) -G
-+
-+## Compiler switch to embed a runtime search path
-+LD_RPATH=	-R
-+LD_RPATH_PRE=	
-+
-+#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
-+
-+## Compiler switch to embed a library name
-+LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
-+
-+## The type of assembly needed when pkgdata is used for generating shared libraries.
-+## Sun modification:
-+GENCCODE_ASSEMBLY=-a sun-x86
-+
-+## Shared object suffix
-+SO=		so
-+## Non-shared intermediate object suffix
-+STATIC_O = o
-+
-+## 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 $<"
-+	@$(GEN_DEPS.c) $< > $@
-+
-+%.d : $(srcdir)/%.cpp
-+	@echo "generating dependency information for $<"
-+	@$(GEN_DEPS.cc) $< > $@
-+
-+## 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) $@
-+
-+# 
-+ifeq (strip $(GENCCODE_ASSEMBLY),)
-+BIR_LDFLAGS=  -Wl,-M,$(NAME).map -Wl,-B,symbolic -Wl,-B,eliminate
-+BIR_DEPS=   $(NAME).map
-+endif
-+
-+## End Solaris-specific setup
--- a/icu/patches/source_configure.patch	Mon Nov 22 09:58:53 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- icu/source/configure.orig	2008-05-09 03:31:31.000000000 +0800
-+++ icu/source/configure	2009-08-25 11:18:56.369712248 +0800
-@@ -3368,11 +3368,17 @@
- else
- 
- case "${host}" in
--*-*-solaris*)
-+i*86-*-solaris*)
-+	if test "$GCC" = yes; then
-+		icu_cv_host_frag=mh-solaris-gcc
-+	else
-+		icu_cv_host_frag=mh-solaris-x86
-+	fi ;;
-+sparc-*-solaris*)
- 	if test "$GCC" = yes; then
- 		icu_cv_host_frag=mh-solaris-gcc
- 	else
--		icu_cv_host_frag=mh-solaris
-+		icu_cv_host_frag=mh-solaris-sparc
- 	fi ;;
- alpha*-*-linux-gnu)
- 	if test "$GCC" = yes; then
upstream/oracle/g11n/g11n-spec