58 lines
2.1 KiB
Diff
58 lines
2.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-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
|