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.
---
 stlport/makefile.mk | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'stlport')

diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index 3e4a8deaec0f..b26de838877a 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -83,6 +83,8 @@ all:
         # stl/_epilog.h.)
 .ENDIF
 
+EXTRPATH=URELIB
+
 ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak \
     src$/gcc-3.0-os2.mak src$/gcc-3.0-os2.def src$/common_macros_os2.mak
 
@@ -90,6 +92,11 @@ ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$
 CONFIGURE_ACTION=none
 CONFIGURE_FLAGS=
 
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+    --prefix=/@.__________________________________________________$(EXTRPATH)
+.END
+
 BUILD_DIR=src
 
 .IF "$(COM)"=="MSC"
-- 
cgit