[svn] gpgme - r1462 - in trunk: . m4 src
svn author marcus
cvs at cvs.gnupg.org
Thu May 6 16:49:44 CEST 2010
Author: marcus
Date: 2010-05-06 16:49:43 +0200 (Thu, 06 May 2010)
New Revision: 1462
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/ltmain.sh
trunk/m4/libtool.m4
trunk/src/ChangeLog
Log:
2010-05-06 Marcus Brinkmann <marcus at g10code.de>
* configure.ac: Detect Windows CE.
(HAVE_W32CE_SYSTEM): New symbol and automake conditional.
* ltmain.sh, m4/libtool.m4: Patch so that it works for Windows CE.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-06 13:39:55 UTC (rev 1461)
+++ trunk/ChangeLog 2010-05-06 14:49:43 UTC (rev 1462)
@@ -1,5 +1,9 @@
2010-05-06 Marcus Brinkmann <marcus at g10code.de>
+ * configure.ac: Detect Windows CE.
+ (HAVE_W32CE_SYSTEM): New symbol and automake conditional.
+ * ltmain.sh, m4/libtool.m4: Patch so that it works for Windows CE.
+
* configure.ac: Require libgpg-error 1.8.
2010-03-15 Werner Koch <wk at g10code.com>
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2010-05-06 13:39:55 UTC (rev 1461)
+++ trunk/src/ChangeLog 2010-05-06 14:49:43 UTC (rev 1462)
@@ -1,3 +1,16 @@
+2010-05-06 Marcus Brinkmann <marcus at g10code.de>
+
+ * sign.c, data-user.c, conversion.c, debug.c, verify.c, data.c,
+ decrypt.c, delete.c, assuan-support.c, import.c, engine-gpgsm.c,
+ data-mem.c, op-support.c, w32-io.c, w32-util.c, data-compat.c: Use
+ gpg_error_from_syserror instead gpg_error_from_errno, and use
+ gpg_err_set_errno to set error number.
+ * setenv.c: Include <gpg-error.h> and define __set_errno to use
+ gpg_err_set_errno.
+ * gpgme-tool.c (ARGP_ERR_UNKNOWN): Define to EDEADLOCK (which is
+ mapped in Windows CE) instead of E2BIG (which is not).
+ (gt_import_keys): Initialize err.
+
2010-04-19 Marcus Brinkmann <marcus at g10code.de>
* assuan-support.c (my_spawn): Cast to avoid warning.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-05-06 13:39:55 UTC (rev 1461)
+++ trunk/configure.ac 2010-05-06 14:49:43 UTC (rev 1462)
@@ -128,7 +128,12 @@
build_w32_glib=no
build_w32_qt=no
case "${host}" in
- *-mingw32*)
+ *-mingw32ce*)
+ have_w32ce_system=yes
+ ;;
+esac
+case "${host}" in
+ *-mingw32ce*|*-mingw32*)
# special stuff for Windoze NT
have_dosish_system=yes
have_w32_system=yes
@@ -185,6 +190,10 @@
AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
fi
AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
+if test "$have_w32ce_system" = yes; then
+ AC_DEFINE(HAVE_W32CE_SYSTEM,1, [Defined if we run on a W32 CE API based system])
+fi
+AM_CONDITIONAL(HAVE_W32CE_SYSTEM, test "$have_w32ce_system" = yes)
AM_CONDITIONAL(BUILD_W32_GLIB, test "$build_w32_glib" = yes)
AM_CONDITIONAL(BUILD_W32_QT, test "$build_w32_qt" = yes)
Modified: trunk/ltmain.sh
===================================================================
--- trunk/ltmain.sh 2010-05-06 13:39:55 UTC (rev 1461)
+++ trunk/ltmain.sh 2010-05-06 14:49:43 UTC (rev 1462)
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
+VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
TIMESTAMP=""
package_revision=1.3012
@@ -5347,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_duplicate_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- fi
- tmp_libs="$tmp_libs $deplib"
- done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_duplicate_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
continue
fi # $pass = conv
@@ -5896,7 +5896,6 @@
if test "$link_all_deplibs" != no; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
- path=
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@ -7681,15 +7680,15 @@
wrappers_required=yes
case $host in
+ *cegcc | *mingw32ce*)
+ # Disable wrappers for cegcc/mingw32ce, we are cross compiling anyway.
+ wrappers_required=no
+ ;;
*cygwin* | *mingw* )
if test "$build_libtool_libs" != yes; then
wrappers_required=no
fi
;;
- *cegcc)
- # Disable wrappers for cegcc, we are cross compiling anyway.
- wrappers_required=no
- ;;
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
Modified: trunk/m4/libtool.m4
===================================================================
--- trunk/m4/libtool.m4 2010-05-06 13:39:55 UTC (rev 1461)
+++ trunk/m4/libtool.m4 2010-05-06 14:49:43 UTC (rev 1462)
@@ -3007,6 +3007,17 @@
lt_cv_file_magic_cmd='func_win32_libid'
;;
+
+mingw32ce*)
+ # Windows CE is often used with non-x86 platforms and thus the below
+ # mingw and cegcc checks don't work. It would be possible to
+ # support other architectures in these checks. However x86 is pretty
+ # hard coded and changing this would require quite some tests on all
+ # the platforms to be sure not to break something. Thus we take the
+ # easy way out and don't check at all.
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
@@ -4261,9 +4272,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
More information about the Gnupg-commits
mailing list