mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-02-17 15:10:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* libltdl/ltdl.c (load_deplibs): Don't append shlib_ext; use

Browse Source 
lt_dlopenext() instead.
This commit is contained in:
Alexandre Oliva 2000-09-04 06:09:25 +00:00
parent c4c91b5984
commit 6aa6b1b1d9
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2000-09-04 Alexandre Oliva <aoliva@redhat.com> 2000-09-04 Alexandre Oliva <aoliva@redhat.com>
* libltdl/ltdl.c (load_deplibs): Don't append shlib_ext; use
lt_dlopenext() instead.
* ltmain.in (link -static): Don't add $link_static_flag; only * ltmain.in (link -static): Don't add $link_static_flag; only
-all-static should do that. -all-static should do that.
* mdemo/configure.in: Revert part of the previous delta. * mdemo/configure.in: Revert part of the previous delta.

10
libltdl/ltdl.c
View File

@ -1165,10 +1165,10 @@ load_deplibs(handle, deplibs)
ret = 0; ret = 0;
goto cleanup; goto cleanup;
} }
names = lt_dlmalloc(depcount * sizeof(char*)); names = (char**)lt_dlmalloc(depcount * sizeof(char*));
if (!names) if (!names)
goto cleanup; goto cleanup;
handles = lt_dlmalloc(depcount * sizeof(lt_dlhandle*)); handles = (lt_dlhandle*)lt_dlmalloc(depcount * sizeof(lt_dlhandle*));
if (!handles) if (!handles)
goto cleanup; goto cleanup;
depcount = 0; depcount = 0;
@ -1185,9 +1185,9 @@ load_deplibs(handle, deplibs)
*end = 0; /* set a temporary string terminator */ *end = 0; /* set a temporary string terminator */
if (strncmp(p, "-l", 2) == 0) { if (strncmp(p, "-l", 2) == 0) {
name = lt_dlmalloc(3+ /* "lib" */ name = lt_dlmalloc(3+ /* "lib" */
strlen(p+2)+strlen(shlib_ext)+1); strlen(p+2)+1);
if (name) if (name)
sprintf(name, "lib%s%s", p+2, shlib_ext); sprintf (name, "lib%s", p+2);
} else } else
name = strdup(p); name = strdup(p);
if (name) if (name)
@ -1202,7 +1202,7 @@ load_deplibs(handle, deplibs)
} }
/* load the deplibs (in reverse order) */ /* load the deplibs (in reverse order) */
for (i = 0; i < depcount; i++) { for (i = 0; i < depcount; i++) {
lt_dlhandle handle = lt_dlopen(names[depcount-1-i]); lt_dlhandle handle = lt_dlopenext(names[depcount-1-i]);
if (!handle) { if (!handle) {
int j; int j;
for (j = 0; j < i; j++) for (j = 0; j < i; j++)