[pango] Bug 690279 - broken relocation of modules



commit 2df1807564ba146a207b8e4087f18161e7beaa0a
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Dec 18 13:59:33 2012 -0500

    Bug 690279 - broken relocation of modules
    
    Fix OS X relocation.

 pango/modules.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/pango/modules.c b/pango/modules.c
index c5a19f2..24cdbf7 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -450,7 +450,13 @@ process_module_file (FILE *module_file, const gchar *module_file_dir)
 	  switch (i)
 	    {
 	    case 0:
-	      if (!g_path_is_absolute (tmp_buf->str))
+	      if (!g_path_is_absolute (tmp_buf->str)
+#ifdef __APPLE__
+	          && strncmp (tmp_buf->str, "@executable_path/", 17)
+	          && strncmp (tmp_buf->str, "@loader_path/", 13)
+	          && strncmp (tmp_buf->str, "@rpath/", 7)
+#endif
+	         )
 		{
 		  const gchar *lib_dir = pango_get_lib_subdirectory ();
 		  const gchar *abs_file_name = g_build_filename (lib_dir,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]