From 2df1807564ba146a207b8e4087f18161e7beaa0a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 18 Dec 2012 13:59:33 -0500 Subject: Bug 690279 - broken relocation of modules Fix OS X relocation. --- pango/modules.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pango') diff --git a/pango/modules.c b/pango/modules.c index c5a19f25..24cdbf7d 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, -- cgit v1.2.1