[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Libtool branch, pr-msvc-support, updated. v2.2.4-36-g75220ca
From: |
Peter Rosin |
Subject: |
[SCM] GNU Libtool branch, pr-msvc-support, updated. v2.2.4-36-g75220ca |
Date: |
Tue, 12 Aug 2008 07:06:21 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".
The branch, pr-msvc-support has been updated
via 75220caf33f6635e80cc2b540a75d58bf0e00d46 (commit)
via 695a0f6a32602dd7ca638c039338fda231f572e9 (commit)
from a91f6a6be907cdd81f32fdc74c2d9987bcc67e74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 75220caf33f6635e80cc2b540a75d58bf0e00d46
Author: Peter Rosin <address@hidden>
Date: Tue Aug 12 09:02:32 2008 +0200
For MSVC, embed the manifest as a resource in the executable.
* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) <postlink_cmds>:
New tag variable.
[ cygwin, mingw, cegcc ] <cl*>: Embed the manifest file as a
resource.
(_LT_LANG_CXX_CONFIG): Likewise.
* libltdl/config/ltmain.m4sh (func_mode_link): After linking
a program, replace @OUTPUT@ in $postlink_cmds and then execute
the commands.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 695a0f6a32602dd7ca638c039338fda231f572e9
Author: Peter Rosin <address@hidden>
Date: Tue Aug 12 08:50:11 2008 +0200
Disable nocase handling for cross compiles.
* libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD): Disable nocase
handling for cross compiles.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 16 ++++++++++++++++
libltdl/config/ltmain.m4sh | 16 ++++++++++++++++
libltdl/m4/libtool.m4 | 38 +++++++++++++++++++++++---------------
3 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d7192ea..53efbc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-08-12 Peter Rosin <address@hidden>
+
+ * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) <postlink_cmds>:
+ New tag variable.
+ [ cygwin, mingw, cegcc ] <cl*>: Embed the manifest file as a
+ resource.
+ (_LT_LANG_CXX_CONFIG): Likewise.
+ * libltdl/config/ltmain.m4sh (func_mode_link): After linking
+ a program, replace @OUTPUT@ in $postlink_cmds and then execute
+ the commands.
+
+2008-08-12 Peter Rosin <address@hidden>
+
+ * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD): Disable nocase
+ handling for cross compiles.
+
2008-08-09 Peter Rosin <address@hidden>
* tests/export.at [MSVC]: dllimport all imported variables.
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 35ae02f..5765b0f 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7340,6 +7340,11 @@ EOF
exit_status=0
func_show_eval "$link_command" 'exit_status=$?'
+ if test -n "$postlink_cmds"; then
+ postlink_cmds=`$ECHO "X$postlink_cmds" | $Xsed -e
'address@hidden@%'"$output"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7385,6 +7390,12 @@ EOF
$opt_dry_run || $RM $output
# Link the executable and exit
func_show_eval "$link_command" 'exit $?'
+
+ if test -n "$postlink_cmds"; then
+ postlink_cmds=`$ECHO "X$postlink_cmds" | $Xsed -e
'address@hidden@%'"$output"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
exit $EXIT_SUCCESS
fi
@@ -7418,6 +7429,11 @@ EOF
func_show_eval "$link_command" 'exit $?'
+ if test -n "$postlink_cmds"; then
+ postlink_cmds=`$ECHO "X$postlink_cmds" | $Xsed -e
'address@hidden@%'"$output_objdir/$outputname"'%g'`
+ func_execute_cmds "$postlink_cmds" 'exit $?'
+ fi
+
# Now create the wrapper script.
func_verbose "creating $output"
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 37c0f71..ad67718 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -3237,21 +3237,19 @@ tpf*)
esac
])
-case $host_os in
-cygwin* | mingw* | pw32*)
- if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- file_magic_glob=
- want_nocaseglob=yes
- else
- file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
| $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- want_nocaseglob=no
- fi
- ;;
-*)
- file_magic_glob=
- want_nocaseglob=no
- ;;
-esac
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo
aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e
"s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
@@ -4812,6 +4810,10 @@ _LT_EOF
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(compile_tag, $1)=-TC
_LT_TAGVAR(dashl_xform, $1)='s/\(.*\)/\1.lib/'
+ _LT_TAGVAR(postlink_cmds, $1)='if test -e "@address@hidden"; then
+ mt -manifest "@address@hidden" -outputresource:"@address@hidden";
+ $RM "@address@hidden";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -5356,6 +5358,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with
templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+ [Commands necessary for finishing linking programs])
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
_LT_TAGDECL([], [dashL_envvar], [1],
@@ -5803,6 +5807,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(compile_tag, $1)=-TP
_LT_TAGVAR(dashl_xform, $1)='s/\(.*\)/\1.lib/'
+ _LT_TAGVAR(postlink_cmds, $1)='if test -e "@address@hidden"; then
+ mt -manifest "@address@hidden" -outputresource:"@address@hidden";
+ $RM "@address@hidden";
+ fi'
;;
*)
# g++
hooks/post-receive
--
GNU Libtool
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Libtool branch, pr-msvc-support, updated. v2.2.4-36-g75220ca,
Peter Rosin <=