Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22123
Modified Files:
libtool14.info libtool14.patch
Log Message:
Backport of patches to libltdl from about to be released
libtool-2.2.6b
Index: libtool14.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/libtool14.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libtool14.patch 2 Mar 2008 07:10:06 -0000 1.1
+++ libtool14.patch 16 Nov 2009 03:28:31 -0000 1.2
@@ -1,10 +1,97 @@
-Index: libtool.m4
-===================================================================
-RCS file: /sources/libtool/libtool/Attic/libtool.m4,v
-retrieving revision 1.314.2.198
-diff -u -r1.314.2.198 libtool.m4
---- a/libtool.m4 14 Feb 2008 23:48:56 -0000 1.314.2.198
-+++ a/libtool.m4 27 Feb 2008 20:29:34 -0000
+diff -urN libtool-1.5.26.orig/libltdl/ltdl.c libtool-1.5.26/libltdl/ltdl.c
+--- libtool-1.5.26.orig/libltdl/ltdl.c 2007-11-15 13:36:41.000000000 -0600
++++ libtool-1.5.26/libltdl/ltdl.c 2009-11-15 21:13:37.000000000 -0600
+@@ -2192,7 +2192,8 @@
+ static int try_dlopen LT_PARAMS((lt_dlhandle *handle,
+ const char *filename));
+ static int tryall_dlopen LT_PARAMS((lt_dlhandle *handle,
+- const char *filename));
++ const char *filename,
++ const char * useloader));
+ static int unload_deplibs LT_PARAMS((lt_dlhandle handle));
+ static int lt_argz_insert LT_PARAMS((char **pargz,
+ size_t *pargz_len,
+@@ -2390,9 +2391,10 @@
+ }
+
+ static int
+-tryall_dlopen (handle, filename)
++tryall_dlopen (handle, filename, useloader)
+ lt_dlhandle *handle;
+ const char *filename;
++ const char *useloader;
+ {
+ lt_dlhandle cur;
+ lt_dlloader *loader;
+@@ -2459,6 +2461,11 @@
+
+ while (loader)
+ {
++ if (useloader && strcmp(loader->loader_name, useloader))
++ {
++ loader = loader->next;
++ continue;
++ }
+ lt_user_data data = loader->dlloader_data;
+
+ cur->module = loader->module_open (data, filename);
+@@ -2528,7 +2535,7 @@
+ error += tryall_dlopen_module (handle,
+ (const char *) 0, prefix, filename);
+ }
+- else if (tryall_dlopen (handle, filename) != 0)
++ else if (tryall_dlopen (handle, filename, NULL) != 0)
+ {
+ ++error;
+ }
+@@ -2549,7 +2556,7 @@
+ /* Try to open the old library first; if it was dlpreopened,
+ we want the preopened version of it, even if a dlopenable
+ module is available. */
+- if (old_name && tryall_dlopen (handle, old_name) == 0)
++ if (old_name && tryall_dlopen (handle, old_name, "dlpreload") == 0)
+ {
+ return 0;
+ }
+@@ -2813,7 +2820,7 @@
+
+ /* Try to dlopen the file, but do not continue searching in any
+ case. */
+- if (tryall_dlopen (handle, filename) != 0)
++ if (tryall_dlopen (handle, filename,NULL) != 0)
+ *handle = 0;
+
+ return 1;
+@@ -3103,7 +3110,7 @@
+ /* lt_dlclose()ing yourself is very bad! Disallow it. */
+ LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
+
+- if (tryall_dlopen (&newhandle, 0) != 0)
++ if (tryall_dlopen (&newhandle, 0, NULL) != 0)
+ {
+ LT_DLFREE (*phandle);
+ return 1;
+@@ -3225,7 +3232,7 @@
+ }
+ #endif
+ }
+- if (!file)
++ else
+ {
+ file = fopen (filename, LT_READTEXT_MODE);
+ }
+@@ -3412,7 +3419,7 @@
+ #endif
+ )))
+ {
+- if (tryall_dlopen (&newhandle, filename) != 0)
++ if (tryall_dlopen (&newhandle, filename, NULL) != 0)
+ {
+ newhandle = NULL;
+ }
+diff -urN libtool-1.5.26.orig/libtool.m4 libtool-1.5.26/libtool.m4
+--- libtool-1.5.26.orig/libtool.m4 2008-02-01 10:26:47.000000000 -0600
++++ libtool-1.5.26/libtool.m4 2009-11-15 21:12:17.000000000 -0600
@@ -6042,25 +6042,7 @@
;;
Index: libtool14.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/libtool14.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libtool14.info 12 Jan 2009 00:06:13 -0000 1.8
+++ libtool14.info 16 Nov 2009 03:28:31 -0000 1.9
@@ -1,6 +1,6 @@
Package: libtool14
Version: 1.5.26
-Revision: 2
+Revision: 3
Maintainer: Peter O'Gorman <pe...@pogma.com>
BuildDepends: fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r)
@@ -10,7 +10,7 @@
Source: mirror:gnu:libtool/libtool-%v.tar.gz
Source-MD5: aa9c5107f3ec9ef4200eb6556f3b3c29
PatchFile: %n.patch
-PatchFile-MD5: a18b5653560ab326f1e7fbb521f70ae2
+PatchFile-MD5: 76fba283378a027cfb5a47406e938ba9
ConfigureParams: --program-transform-name=s/libtool/glibtool/
--infodir=%p/share/info
CompileScript: <<
F77=no ./configure %c
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
