Applied two simple patches.
authorWerner Koch <wk@gnupg.org>
Mon, 23 Oct 2006 09:14:16 +0000 (09:14 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 23 Oct 2006 09:14:16 +0000 (09:14 +0000)
ChangeLog
Makefile.am
mpi/ChangeLog
mpi/config.links
src/ChangeLog
src/gcrypt.h.in

index 3707bcc..c3c1d3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-20  Werner Koch  <wk@g10code.com>
+
+       * Makefile.am (stowinstall): New convenience target.
+
 2006-10-12  Marcus Brinkmann  <marcus@g10code.de>
 
        * configure.ac (FALLBACK_SOCKLEN_T): Third time is a charm.
index ad00307..70fd2ca 100644 (file)
@@ -42,6 +42,9 @@ dist-hook:
        @set -e; \
        echo "$(VERSION)" > $(distdir)/VERSION
 
+stowinstall: 
+       $(MAKE) $(AM_MAKEFLAGS) install prefix=/usr/local/stow/libgcrypt
+
 
 
 
index c670967..c066d11 100644 (file)
@@ -1,3 +1,9 @@
+2006-10-23  Werner Koch  <wk@g10code.com>
+
+       * config.links (mpi_optional_modules): Make sure that powerpc64 is
+       matched before a generic powerpc.  Reported by Andreas Metzler.
+       Should fix Debian bug 284609.
+
 2006-08-25  Werner Koch  <wk@g10code.com>
 
        * mpi-bit.c (gcry_mpi_rshift): Don't shift if N == 0 but do a
index b27157e..6ea80b3 100644 (file)
@@ -221,13 +221,6 @@ case "${target}" in
        path="m68k/mc68020 m68k"
        ;;
 
-    powerpc*-*-linux*)
-       echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
-       echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
-       cat   $srcdir/mpi/powerpc32/syntax.h    >>./mpi/asm-syntax.h
-       path="powerpc32"
-       ;;
-
     powerpc*-*-netbsd* | powerpc*-*-openbsd*)
        echo '/* configured {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
        echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
@@ -236,6 +229,18 @@ case "${target}" in
        path="powerpc32"
        ;;
 
+    ppc620-*-*     | \
+    powerpc64*-*-*)
+       mpi_sflags="-Wa,-mppc"
+       path="powerpc64"
+       ;;
+    powerpc*-*-linux*)
+       echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
+       echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
+       cat   $srcdir/mpi/powerpc32/syntax.h    >>./mpi/asm-syntax.h
+       path="powerpc32"
+       ;;
+
     rs6000-*-aix[456789]*    | \
     rs6000-*-aix3.2.[456789])
        mpi_sflags="-Wa,-mpwr"
@@ -264,11 +269,6 @@ case "${target}" in
        mpi_sflags="-Wa,-mppc"
        path="powerpc32"
        ;;
-    ppc620-*-*     | \
-    powerpc64*-*-*)
-       mpi_sflags="-Wa,-mppc"
-       path="powerpc64"
-       ;;
     powerpc*-*-*)
        mpi_sflags="-Wa,-mppc"
        path="powerpc32"
index be1a27b..2b7a0f9 100644 (file)
@@ -1,3 +1,9 @@
+2006-10-23  Werner Koch  <wk@g10code.com>
+
+       * gcrypt.h.in (GCRY_THREAD_OPTION_PTHREAD_IMPL): Add some cast for
+       use by C-doubleplus.  In general I don't like this but due to
+       public demand I give up ;-)
+
 2006-10-19  Werner Koch  <wk@g10code.com>
 
        * global.c (gcry_control) <GCRYCTL_INIT_SECMEM>: Return an error
index cfcf329..24620eb 100644 (file)
@@ -257,7 +257,7 @@ static struct gcry_thread_cbs gcry_threads_pth = { GCRY_THREAD_OPTION_PTH,    \
 static int gcry_pthread_mutex_init (void **priv)                             \
 {                                                                            \
   int err = 0;                                                               \
-  pthread_mutex_t *lock = malloc (sizeof (pthread_mutex_t));                 \
+  pthread_mutex_t *lock = (pthread_mutex_t*)malloc (sizeof (pthread_mutex_t));\
                                                                              \
   if (!lock)                                                                 \
     err = ENOMEM;                                                            \
@@ -272,11 +272,12 @@ static int gcry_pthread_mutex_init (void **priv)                        \
   return err;                                                                \
 }                                                                            \
 static int gcry_pthread_mutex_destroy (void **lock)                          \
-  { int err = pthread_mutex_destroy (*lock);  free (*lock); return err; }     \
+  { int err = pthread_mutex_destroy ((phread_mutex_t*)*lock);                 \
+    free (*lock); return err; }                                               \
 static int gcry_pthread_mutex_lock (void **lock)                             \
-  { return pthread_mutex_lock (*lock); }                                     \
+  { return pthread_mutex_lock ((phread_mutex_t*)*lock); }                    \
 static int gcry_pthread_mutex_unlock (void **lock)                           \
-  { return pthread_mutex_unlock (*lock); }                                   \
+  { return pthread_mutex_unlock ((phread_mutex_t*)*lock); }                  \
                                                                              \
 static struct gcry_thread_cbs gcry_threads_pthread =                         \
 { GCRY_THREAD_OPTION_PTHREAD, NULL,                                          \