[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: FYI: backport w32 fixes
From: |
Ralf Wildenhues |
Subject: |
Re: FYI: backport w32 fixes |
Date: |
Mon, 28 Nov 2005 13:41:47 +0100 |
User-agent: |
Mutt/1.5.11 |
* Ralf Wildenhues wrote on Fri, Nov 25, 2005 at 07:36:23PM CET:
>
> I have applied these patches to branch-1-5. All backports of HEAD
> patches, some took more than one patch in HEAD to fix at once, but
> it makes little sense to relive those errand states. While the diffs
> look huge, they are pretty straightforward in syncing the two branches.
>
> Backporting, by the way, turned up another new issue present in both
> branches, which will be addressed separately, afterwards so the fix
> is the same.
Some cleanup first: I made a typo while backporting, and introduced
some unwanted newlines in C macro arguments. Fixed as below.
No more testsuite failures on Cygwin now.
Cheers,
Ralf
* ltmain.in: Fix typo introduced in dllsearchpath backport.
<cwrappersource>: Undo line breaks in macro arguments.
Reported by Charles Wilson <address@hidden>.
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.106
diff -u -r1.334.2.106 ltmain.in
--- ltmain.in 27 Nov 2005 15:18:03 -0000 1.334.2.106
+++ ltmain.in 28 Nov 2005 6:07:34 -0000
@@ -4303,7 +4303,7 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
*) dllsearchpath="$dllsearchpath:$libdir";;
@@ -4941,8 +4941,7 @@
{
struct stat st;
- DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") :
"NULL!"
-);
+ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") :
"NULL!");
if ((!path) || (!*path))
return 0;
@@ -4975,8 +4974,7 @@
int tmp_len;
char* concat_name;
- DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!")
:
- "NULL!");
+ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!")
: "NULL!");
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;