From 7c4f2ec8a795534164ee1923093b7d5be0126c55 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 29 Feb 2012 18:34:42 +0100
Subject: Simplify install name handling for external libraries on Mac OS X

...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc.  This removes
the need for the special extshl and EXTRPATH=LOADER.  Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
---
 icu/makefile.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'icu')

diff --git a/icu/makefile.mk b/icu/makefile.mk
index 872544cef5e5..b906d427fc79 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -148,6 +148,11 @@ icu_LDFLAGS+=-lgnustl_shared
 CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
 ./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)'
 
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_ACTION += \
+    --prefix=/@.__________________________________________________$(EXTRPATH)
+.END
+
 CONFIGURE_FLAGS=
 
 # Use of
@@ -191,7 +196,7 @@ OUT2LIB= \
     $(BUILD_DIR)$/lib$/libicutu$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) \
     $(BUILD_DIR)$/lib$/libicutu$(DLLPOST)
 
-OUT2BIN= \
+OUT2BIN_NONE= \
     $(BUILD_DIR)$/bin$/genccode \
     $(BUILD_DIR)$/bin$/genbrk \
     $(BUILD_DIR)$/bin$/gencmn
-- 
cgit