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.
---
 glib/makefile.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'glib')

diff --git a/glib/makefile.mk b/glib/makefile.mk
index 0efb7ec3b665..0180e1d35be0 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -73,7 +73,13 @@ CONFIGURE_FLAGS+= \
     ac_cv_func__NSGetEnviron=yes
 .ENDIF
 
+.IF "$(OS)" == "MACOSX"
+CONFIGURE_FLAGS += \
+    --prefix=/@.__________________________________________________$(EXTRPATH)
+.ELSE
 CONFIGURE_FLAGS+=--prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)
+.END
+
 CONFIGURE_FLAGS+=--disable-fam
 CONFIGURE_FLAGS+=CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS) -DBUILD_OS_APPLEOSX"
 CONFIGURE_FLAGS+=CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external"
@@ -93,8 +99,6 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS)
 
 .IF "$(OS)"!="IOS"
 
-EXTRPATH=LOADER
-
 .IF "$(OS)" == "MACOSX"
 my_ext = .0$(DLLPOST)
 .ELSE
@@ -107,9 +111,9 @@ OUT2LIB+=gmodule/.libs/libgmodule-2.0$(my_ext)
 OUT2LIB+=gobject/.libs/libgobject-2.0$(my_ext)
 OUT2LIB+=gthread/.libs/libgthread-2.0$(my_ext)
 
-OUT2BIN+=gobject/glib-mkenums
-OUT2BIN+=gobject/.libs/glib-genmarshal
-OUT2BIN+=gio/.libs/glib-compile-schemas
+OUT2BIN_NONE+=gobject/glib-mkenums
+OUT2BIN_NONE+=gobject/.libs/glib-genmarshal
+OUT2BIN_NONE+=gio/.libs/glib-compile-schemas
 
 .ELSE
 
-- 
cgit