aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/gobject-introspection-girepository.patch
blob: 380617f27f8a81919d92a33b05b86d1151d04976 (about) (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
--- a/girepository/gitypelib.c.orig
+++ b/girepository/gitypelib.c
@@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib)
         {
           GModule *module;
 
+          /* 'gobject-introspection' doesn't store the path of shared
+             libraries into '.typelib' and '.gir' files.  Shared
+             libraries are searched for in the dynamic linker search
+             path.  In Guix we patch 'gobject-introspection' such that
+             it stores the absolute path of shared libraries in
+             '.typelib' and '.gir' files.  Here, in order to minimize
+             side effects, we make sure that if the library is not
+             found at the indicated path location, we try with just
+             the basename and the system dynamic library
+             infrastructure, as per default behaviour of the
+             library. */
           module = load_one_shared_library (shlibs[i]);
+          if (module == NULL && g_path_is_absolute (shlibs[i]))
+            {
+              module = load_one_shared_library (g_basename(shlibs[i]));
+            }
 
           if (module == NULL)
             {
gs.gnu.org/22186>. diff --git a/gcc/gcc.c b/gcc/gcc.c index a716f708259..dc7862f413a 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -4342,7 +4342,7 @@ process_command (unsigned int decoded_options_count, } temp = env.get (LIBRARY_PATH_ENV); - if (temp && *cross_compile == '0') + if (temp) { const char *startp, *endp; char *nstore = (char *) alloca (strlen (temp) + 3); diff --git a/gcc/incpath.c b/gcc/incpath.c index b11c6a57939..a66a94a04e5 100644 --- a/gcc/incpath.c +++ b/gcc/incpath.c @@ -472,8 +472,8 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, int stdinc, int cxx_stdinc, int verbose) { static const char *const lang_env_vars[] = - { "C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH", - "OBJC_INCLUDE_PATH", "OBJCPLUS_INCLUDE_PATH" }; + { "CROSS_C_INCLUDE_PATH", "CROSS_CPLUS_INCLUDE_PATH", + "CROSS_OBJC_INCLUDE_PATH", "CROSS_OBJCPLUS_INCLUDE_PATH" }; cpp_options *cpp_opts = cpp_get_options (pfile); size_t idx = (cpp_opts->objc ? 2: 0); @@ -484,7 +484,7 @@ register_include_chains (cpp_reader *pfile, const char *sysroot, /* CPATH and language-dependent environment variables may add to the include chain. */ - add_env_var_paths ("CPATH", INC_BRACKET); + add_env_var_paths ("CROSS_CPATH", INC_BRACKET); add_env_var_paths (lang_env_vars[idx], INC_SYSTEM); target_c_incpath.extra_pre_includes (sysroot, iprefix, stdinc); diff --git a/gcc/system.h b/gcc/system.h index 4abc321c71d..d6186476024 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1209,4 +1209,6 @@ helper_const_non_const_cast (const char *p) void qsort_chk (void *, size_t, size_t, int (*)(const void *, const void *)); #endif +#define LIBRARY_PATH_ENV "CROSS_LIBRARY_PATH" + #endif /* ! GCC_SYSTEM_H */ diff --git a/gcc/tlink.c b/gcc/tlink.c index ec20bd2fa0f..cd17bdce004 100644 --- a/gcc/tlink.c +++ b/gcc/tlink.c @@ -456,7 +456,7 @@ recompile_files (void) file *f; putenv (xstrdup ("COMPILER_PATH=")); - putenv (xstrdup ("LIBRARY_PATH=")); + putenv (xstrdup (LIBRARY_PATH_ENV "=")); while ((f = file_pop ()) != NULL) {