cb6ac318a7
2008-12-03 15:13:15 +0100 cmc r264790 : shrink patch 2008-12-03 14:26:43 +0100 cmc r264776 : shrink patch 2008-12-02 16:24:53 +0100 rene r264718 : revert, thanks sb 2008-12-02 10:47:21 +0100 rene r264675 : apply https://svn.boost.org/trac/boost/attachment/ticket/2069/0001-boost.mpl-gcc-4.4-fixes.patch for gcc 4.4 support (unbreaks at least canvas' build) 2008-12-01 22:08:16 +0100 rene r264643 : missing include (already needed for gcc 4.3) 2008-12-01 22:07:07 +0100 rene r264642 : allow gcc 4.4 2008-12-01 22:06:34 +0100 rene r264641 : fix conditional so that it builds with gcc 4.4 (patch from http://bugs.debian.org/505371)
110 lines
4.1 KiB
Diff
110 lines
4.1 KiB
Diff
--- misc/icu/source/common/putil.c 2008-07-01 03:41:12.000000000 +0200
|
|
+++ misc/build/icu/source/common/putil.c 2008-09-02 07:01:29.335795765 +0200
|
|
@@ -52,7 +52,7 @@
|
|
Poorly upgraded Solaris machines can't have this defined.
|
|
Cleanly installed Solaris can use this #define.
|
|
*/
|
|
-#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199901L)
|
|
+#if !defined(_XOPEN_SOURCE_EXTENDED) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)
|
|
#define _XOPEN_SOURCE_EXTENDED 1
|
|
#endif
|
|
|
|
--- misc/icu/source/config/mh-darwin Tue Jul 1 03:41:24 2008
|
|
+++ misc/build/icu/source/config/mh-darwin Fri Oct 31 09:13:56 2008
|
|
@@ -25,7 +25,7 @@
|
|
SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
|
|
|
|
## Compiler switches to embed a library name and version information
|
|
-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET))
|
|
+LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name @executable_path/$(notdir $(FINAL_SO_TARGET))
|
|
|
|
## Compiler switch to embed a runtime search path
|
|
LD_RPATH=
|
|
@@ -41,10 +41,6 @@
|
|
## Non-shared intermediate object suffix
|
|
STATIC_O = ao
|
|
|
|
-## Override Versioned target for a shared library.
|
|
-FINAL_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION).$(SO)
|
|
-MIDDLE_SO_TARGET= $(basename $(SO_TARGET)).$(SO_TARGET_VERSION_MAJOR).$(SO)
|
|
-
|
|
## Compilation rules
|
|
%.$(STATIC_O): $(srcdir)/%.c
|
|
$(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
|
|
@@ -76,15 +72,9 @@
|
|
|
|
## Versioned libraries rules
|
|
|
|
-%.$(SO_TARGET_VERSION_MAJOR).$(SO): %.$(SO_TARGET_VERSION).$(SO)
|
|
+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
|
|
$(RM) $@ && ln -s ${<F} $@
|
|
-%.$(SO): %.$(SO_TARGET_VERSION_MAJOR).$(SO)
|
|
- $(RM) $@ && ln -s ${*F}.$(SO_TARGET_VERSION).$(SO) $@
|
|
+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
|
|
+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
|
|
|
|
-# tzcode option
|
|
-TZORIG_EXTRA_CFLAGS=-DSTD_INSPIRED
|
|
-
|
|
-# genren opts
|
|
-GENREN_PL_OPTS=-x Mach-O -n '-g' -p '| c++filt'
|
|
-
|
|
## End Darwin-specific setup
|
|
--- misc/icu/source/config/mh-linux 2007-12-12 19:57:36.000000000 +0100
|
|
+++ misc/build/icu/source/config/mh-linux 2008-05-21 18:59:13.000000000 +0200
|
|
@@ -20,6 +20,14 @@
|
|
LD_RPATH=
|
|
LD_RPATH_PRE = -Wl,-rpath,
|
|
|
|
+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
|
|
+## (incl. the C++ runtime libs potentially found in the URE lib dir):
|
|
+ENABLE_RPATH=YES
|
|
+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
|
|
+
|
|
+#SH# ENABLE_RPATH=YES
|
|
+#SH# RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'"
|
|
+
|
|
## These are the library specific LDFLAGS
|
|
LDFLAGSICUDT=-nodefaultlibs -nostdlib
|
|
|
|
--- misc/icu/source/config/mh-solaris 2007-12-12 19:57:36.000000000 +0100
|
|
+++ misc/build/icu/source/config/mh-solaris 2008-05-21 19:02:45.000000000 +0200
|
|
@@ -18,17 +18,24 @@
|
|
|
|
## 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)
|
|
+LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath
|
|
+LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -norunpath
|
|
|
|
## Commands to make a shared library
|
|
SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -G
|
|
-SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G
|
|
+SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -G -norunpath
|
|
|
|
## Compiler switch to embed a runtime search path
|
|
LD_RPATH= -R
|
|
LD_RPATH_PRE=
|
|
|
|
+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
|
|
+ENABLE_RPATH=YES
|
|
+RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN'
|
|
+
|
|
+#SH# ENABLE_RPATH=YES
|
|
+#SH# RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'"
|
|
+
|
|
#LIBRARY_PATH_PREFIX=/usr/lib/lwp:
|
|
|
|
## Compiler switch to embed a library name
|
|
--- misc/icu/source/layoutex/ParagraphLayout.cpp 2008-07-01 03:42:02.000000000 +0200
|
|
+++ misc/build/icu/source/layoutex/ParagraphLayout.cpp 2008-12-01 19:32:58.000000000 +0100
|
|
@@ -868,7 +868,7 @@
|
|
|
|
return nullLanguageCode;
|
|
}
|
|
-#elif
|
|
+#else
|
|
|
|
// TODO - dummy implementation for right now...
|
|
le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)
|