[git] GPG-ERROR - branch, master, updated. libgpg-error-1.12-19-ge1aa030
by Werner Koch
cvs at cvs.gnupg.org
Sat Jan 25 12:50:42 CET 2014
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 "Error codes used by GnuPG et al.".
The branch, master has been updated
via e1aa030d7655743f0c3cdd5f7b26ae1b4665fbc6 (commit)
via 8e352780fd0e2fbc8f4c4971aae188d62df24d0a (commit)
via 2e4c5963119dc02cac7b8f0dfb46572c43d1ebe7 (commit)
from f209d163a8167caa6910cd367aba923f703ac69e (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 e1aa030d7655743f0c3cdd5f7b26ae1b4665fbc6
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 9 19:14:09 2014 +0100
Add lock info for arm-unknown-linux-androideabi.
* src/syscfg/lock-obj.arm-unknown-linux-androideabi.h: New. Provided
by Hans-Christoph Steiner.
* src/Makefile.am (lock_obj_pub): Add file.
diff --git a/src/Makefile.am b/src/Makefile.am
index 77ece16..0a8a59a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,8 +41,8 @@ endif
# Distributed lock object definitions for cross compilation.
lock_obj_pub = \
- syscfg/lock-obj-pub.mingw32.h
-
+ syscfg/lock-obj-pub.mingw32.h \
+ syscfg/lock-obj.arm-unknown-linux-androideabi.h
lib_LTLIBRARIES = libgpg-error.la
include_HEADERS = gpg-error.h
diff --git a/src/syscfg/lock-obj.arm-unknown-linux-androideabi.h b/src/syscfg/lock-obj.arm-unknown-linux-androideabi.h
new file mode 100644
index 0000000..adcf46f
--- /dev/null
+++ b/src/syscfg/lock-obj.arm-unknown-linux-androideabi.h
@@ -0,0 +1,21 @@
+## lock-obj.arm-unknown-linux-androideabi.h
+## File created by gen-posix-lock-obj - DO NOT EDIT
+## To be included by mkheader into gpg-error.h
+
+typedef struct
+{
+ long _vers;
+ union {
+ volatile char _priv[4];
+ long _x_align;
+ long *_xp_align;
+ } u;
+} gpgrt_lock_t;
+
+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0}}}
+##
+## Local Variables:
+## mode: c
+## buffer-read-only: t
+## End:
+##
commit 8e352780fd0e2fbc8f4c4971aae188d62df24d0a
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 9 19:14:09 2014 +0100
tests: Call srand for each thread under Windows.
* tests/t-lock.c (accountant_thread) [W32]: Call srand.
diff --git a/tests/t-lock.c b/tests/t-lock.c
index 91923fb..190d63e 100644
--- a/tests/t-lock.c
+++ b/tests/t-lock.c
@@ -164,6 +164,9 @@ accountant_thread (void *arg)
(void)arg;
+#ifdef _WIN32
+ srand (time(NULL)*getpid()); /* Windows needs it per thread. */
+#endif
for (i = 0; i < N_TRANSACTIONS; i++)
{
rc = gpgrt_lock_lock (&accounts_lock);
commit 2e4c5963119dc02cac7b8f0dfb46572c43d1ebe7
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jan 9 19:14:09 2014 +0100
Do not use the threadlib macros for Windows.
* configure.ac: Move platform detection before gl_THREADLIB_EARLY. Do
not use gl_THREADLIB for Windows.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/configure.ac b/configure.ac
index e3fa795..77f235f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,28 +85,6 @@ AC_PROG_AWK
AC_CHECK_TOOL(AR, ar, :)
AC_GNU_SOURCE
-gl_THREADLIB_EARLY
-
-
-LT_PREREQ([2.2.6])
-LT_INIT([win32-dll disable-static])
-LT_LANG([Windows Resource])
-
-
-# We need to compile and run a program on the build machine.
-dnl The AC_PROG_CC_FOR_BUILD macro in the AC archive is broken for
-dnl autoconf 2.57.
-dnl AC_PROG_CC_FOR_BUILD
-AC_MSG_CHECKING(for cc for build)
-if test "$cross_compiling" = "yes"; then
- CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
-else
- CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
-fi
-AC_MSG_RESULT($CC_FOR_BUILD)
-AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
-
-
# Set some internal variables depending on the platform for later use.
have_w32_system=no
have_w64_system=no
@@ -128,6 +106,30 @@ case "${host}" in
esac
+if test "$have_w32_system" != yes; then
+ gl_THREADLIB_EARLY
+fi
+
+
+LT_PREREQ([2.2.6])
+LT_INIT([win32-dll disable-static])
+LT_LANG([Windows Resource])
+
+
+# We need to compile and run a program on the build machine.
+dnl The AC_PROG_CC_FOR_BUILD macro in the AC archive is broken for
+dnl autoconf 2.57.
+dnl AC_PROG_CC_FOR_BUILD
+AC_MSG_CHECKING(for cc for build)
+if test "$cross_compiling" = "yes"; then
+ CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
+else
+ CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
+fi
+AC_MSG_RESULT($CC_FOR_BUILD)
+AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
+
+
AH_BOTTOM([
/* Force using of NLS for W32 even if no libintl has been found. This is
okay because we have our own gettext implementation for W32. */
@@ -166,11 +168,27 @@ AC_CHECK_FUNCS([flockfile])
AC_C_CONST
-# Check for thread library
-gl_LOCK
-if test "$gl_threads_api" = posix; then
- AC_CHECK_SIZEOF(pthread_mutex_t,,[AC_INCLUDES_DEFAULT
- #include <pthread.h>])
+# Check for thread library.
+#
+# Windows has always thread support; thus we don't bother to test for
+# it as it may lead to false results when cross building.
+if test "$have_w32_system" = yes; then
+ AC_DEFINE([USE_WINDOWS_THREADS], [1])
+ LIBTHREAD=
+ LTLIBTHREAD=
+ LIBMULTITHREAD=
+ LTLIBMULTITHREAD=
+ THREADLIB_CPPFLAGS=""
+ AC_SUBST([LIBTHREAD])
+ AC_SUBST([LTLIBTHREAD])
+ AC_SUBST([LIBMULTITHREAD])
+ AC_SUBST([LTLIBMULTITHREAD])
+else
+ gl_LOCK
+ if test "$gl_threads_api" = posix; then
+ AC_CHECK_SIZEOF(pthread_mutex_t,,[AC_INCLUDES_DEFAULT
+ #include <pthread.h>])
+ fi
fi
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 72 ++++++++++++--------
src/Makefile.am | 4 +-
.../lock-obj.arm-unknown-linux-androideabi.h | 21 ++++++
tests/t-lock.c | 3 +
4 files changed, 71 insertions(+), 29 deletions(-)
create mode 100644 src/syscfg/lock-obj.arm-unknown-linux-androideabi.h
hooks/post-receive
--
Error codes used by GnuPG et al.
http://git.gnupg.org
More information about the Gnupg-commits
mailing list