Attachment 36074 Details for Bug 28264 – Don't strip /usr/include or /usr/lib

[patch] Don't strip /usr/include or /usr/lib

dontstrip.patch (text/plain), 3.19 KB, created by junkmailnotread on 2010-06-05 04:59:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: junkmailnotread

Created: 2010-06-05 04:59:04 UTC

Size: 3.19 KB

patch

obsolete

>diff -ru a/pkg.c b/pkg.c
>--- a/pkg.c	2010-05-08 21:14:17.000000000 +0100
>+++ b/pkg.c	2010-06-05 12:32:08.006581822 +0100
>@@ -751,13 +751,9 @@
> {
>   GSList *requires = NULL;
>   GSList *conflicts = NULL;
>-  GSList *system_directories = NULL;
>   GSList *iter;
>   GSList *requires_iter;
>   GSList *conflicts_iter;
>-  GSList *system_dir_iter = NULL;
>-  int count;
>-  const gchar *c_include_path;
> 
>   /* Be sure we have the required fields */
> 
>@@ -865,107 +861,6 @@
>     }
>   
>   g_slist_free (requires);
>-
>-  /* We make a list of system directories that gcc expects so we can remove
>-   * them.
>-   */
>-#ifndef G_OS_WIN32
>-  system_directories = g_slist_append (NULL, g_strdup ("/usr/include"));
>-#endif
>-
>-  c_include_path = g_getenv ("C_INCLUDE_PATH");
>-  if (c_include_path != NULL)
>-    {
>-      system_directories = add_env_variable_to_list (system_directories, c_include_path);
>-    }
>-  
>-  c_include_path = g_getenv ("CPLUS_INCLUDE_PATH");
>-  if (c_include_path != NULL)
>-    {
>-      system_directories = add_env_variable_to_list (system_directories, c_include_path);
>-    }
>-
>-  count = 0;
>-  iter = pkg->I_cflags;
>-  while (iter != NULL)
>-    {
>-      gint offset = 0;
>-      /* we put things in canonical -I/usr/include (vs. -I /usr/include) format,
>-       * but if someone changes it later we may as well be robust
>-       */
>-      if (((strncmp (iter->data, "-I", 2) == 0) && (offset = 2))||
>-          ((strncmp (iter->data, "-I ", 3) == 0) && (offset = 3)))
>-        {
>-	  if (offset == 0)
>-	    {
>-	      iter = iter->next;
>-	      continue;
>-	    }
>-
>-	  system_dir_iter = system_directories;
>-	  while (system_dir_iter != NULL)
>-	    {
>-	      if (strcmp (system_dir_iter->data,
>-                          ((char*)iter->data) + offset) == 0)
>-		{
>-		  debug_spew ("Package %s has %s in Cflags\n",
>-			      pkg->name, (gchar *)iter->data);
>-		  if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") == NULL)
>-		    {
>-		      debug_spew ("Removing %s from cflags for %s\n", iter->data, pkg->key);
>-		      ++count;
>-		      iter->data = NULL;
>-		      
>-		      break;
>-		    }
>-		}
>-	      system_dir_iter = system_dir_iter->next;
>-	    }
>-        }
>-
>-      iter = iter->next;
>-    }
>-
>-  while (count)
>-    {
>-      pkg->I_cflags = g_slist_remove (pkg->I_cflags, NULL);
>-      --count;
>-    }
>-
>-  g_slist_foreach (system_directories, (GFunc) g_free, NULL);
>-  g_slist_free (system_directories);
>-
>-#ifdef PREFER_LIB64
>-#define SYSTEM_LIBDIR "/usr/lib64"
>-#else
>-#define SYSTEM_LIBDIR "/usr/lib"
>-#endif
>-  count = 0;
>-  iter = pkg->L_libs;
>-  while (iter != NULL)
>-    {
>-      if (strcmp (iter->data, "-L" SYSTEM_LIBDIR) == 0 ||
>-          strcmp (iter->data, "-L " SYSTEM_LIBDIR) == 0)
>-        {
>-          debug_spew ("Package %s has -L" SYSTEM_LIBDIR " in Libs\n",
>-                      pkg->name);
>-          if (g_getenv ("PKG_CONFIG_ALLOW_SYSTEM_LIBS") == NULL)
>-            {              
>-              iter->data = NULL;
>-              ++count;
>-              debug_spew ("Removing -L" SYSTEM_LIBDIR " from libs for %s\n", pkg->key);
>-            }
>-        }
>-
>-      iter = iter->next;
>-    }
>-#undef SYSTEM_LIBDIR
>-
>-  while (count)
>-    {
>-      pkg->L_libs = g_slist_remove (pkg->L_libs, NULL);
>-      --count;
>-    }
> }
> 
> static char*

Actions: View | Splinter Review

Attachments on bug 28264: 36071 | 36074

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.