--- src/Makefile.in.orig	2018-04-19 01:35:57 -0400
+++ src/Makefile.in	2018-04-19 01:38:51 -0400
@@ -161,7 +161,8 @@
 	libgcrypt_la-sexp.lo libgcrypt_la-hwfeatures.lo \
 	libgcrypt_la-stdmem.lo libgcrypt_la-secmem.lo \
 	libgcrypt_la-missing-string.lo libgcrypt_la-fips.lo \
-	libgcrypt_la-hmac256.lo libgcrypt_la-context.lo
+	libgcrypt_la-hmac256.lo libgcrypt_la-context.lo \
+	../cipher/*.lo ../mpi/*.lo
 libgcrypt_la_OBJECTS = $(am_libgcrypt_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -496,9 +497,9 @@
 
 libgcrypt_la_LIBADD = $(gcrypt_res) \
         $(gcrypt_hwf_modules) \
-	../cipher/libcipher.la \
-	../random/librandom.la \
-	../mpi/libmpi.la \
+	../cipher/.libs/libcipher.a \
+	../random//.libs/librandom.a \
+	../mpi/.libs/libmpi.a \
 	../compat/libcompat.la  $(GPG_ERROR_LIBS)
 
 dumpsexp_SOURCES = dumpsexp.c

*** ./random/random-drbg.c.ORIG	Mon Dec 18 20:14:47 2017
--- ./random/random-drbg.c	Mon Dec 18 20:15:36 2017
***************
*** 497,502 ****
--- 497,510 ----
    return (1 << 16);
  }
  
+ #ifndef SIZE_MAX
+ # if (__64BIT__)
+ #  define SIZE_MAX        UINT64_MAX
+ # else
+ #  define SIZE_MAX        UINT32_MAX
+ # endif
+ #endif
+ 
  static inline size_t
  drbg_max_addtl (void)
  {
*** ./cipher/Makefile.in.ORIG	Mon Dec 18 20:49:12 2017
--- ./cipher/Makefile.in	Mon Dec 18 21:02:35 2017
***************
*** 121,127 ****
  am_libcipher_la_OBJECTS = cipher.lo cipher-cbc.lo cipher-cfb.lo \
  	cipher-ofb.lo cipher-ctr.lo cipher-aeswrap.lo cipher-ccm.lo \
  	cipher-cmac.lo cipher-gcm.lo cipher-gcm-intel-pclmul.lo \
- 	cipher-gcm-armv8-aarch32-ce.lo cipher-gcm-armv8-aarch64-ce.lo \
  	cipher-poly1305.lo cipher-ocb.lo cipher-xts.lo \
  	cipher-selftest.lo pubkey.lo pubkey-util.lo md.lo mac.lo \
  	mac-hmac.lo mac-cmac.lo mac-gmac.lo mac-poly1305.lo \
--- 121,126 ----