W32 build fixes for libgcrypt-1.5.0

LRN lrn1986 at gmail.com
Sat Jan 26 04:18:45 CET 2013


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Subj is attached.
If you need patches against git master HEAD, just ask.

001-libtool-tag-for-RC.mingw32.patch:
When compiling resource files, use do not use a tag (don't ask me why
it doesn't work with --tag - i don't know).

002-create-libdir-first.mingw32.patch:
I'm not sure why $(DESTDIR)$(libdir) is not created by $(INSTALL), but
it isn't. This creates it.
Maybe it's better to use $(INSTALL) -d $(DESTDIR)$(libdir)
I don't know. This becomes most obvious when you install into (empty)
staging directory.

003-no-unconditional-fig2dev.mingw32.patch:
This is a hack, not a valid patch.
It prevents `make' from trying to run fig2dev (which is not available
on W32, and likely will never be).
I don't know what is the right way to fix this.

004-fix-nondef-symbol-list-on.mingw32.patch:
Same problem as in libgpg-error - -export-symbols takes a symbol list,
not a MS .def file.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJRA0sUAAoJEOs4Jb6SI2Cw5BUH/iBaGLZTgzKBEtCTQLOELH7D
t2tSDHq0vVG2shArfzKLMFQePmRd4tTM2SODZNOxxH0KIVjmqhCj9HL0JFYjK8va
/JYCnEnUvq0+cX0QgmZGws63Y6HkszfViaPLT/mo7z2oRuqCBIYSu9b3WMRxFe2N
ya0ulxN0Un6Mx6na+Q76yZ6wIuZL1QolqqtlYQi/g+qbEZWXzIf7GSbAfvJiUbBZ
Op6d04rqpjb4m1nGH8Agx5cdCu+tZNoU7ipJxGCYLRkgKg0PpnSXKzhdG3mGhG/v
tRpQ70CJ1hYjz7qYHGIjFGMAelG7iTvL4Axv1WpQFdORyrYZhEu3Bf96I1h96g4=
=aQcX
-----END PGP SIGNATURE-----
-------------- next part --------------
--- libgcrypt-1.5.0/src/Makefile.am.orig	2011-05-23 12:07:51 +0400
+++ libgcrypt-1.5.0/src/Makefile.am	2012-03-27 21:23:31 +0400
@@ -64,7 +64,7 @@
 
 RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(libgcrypt_la_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
-LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
+LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RCCOMPILE)
 
 SUFFIXES = .rc .lo
 
-------------- next part --------------
--- libgcrypt-1.5.0/src/Makefile.am.orig	2012-09-12 02:57:53 +0400
+++ libgcrypt-1.5.0/src/Makefile.am	2012-09-12 03:21:55 +0400
@@ -76,6 +76,7 @@
 export_symbols = -export-symbols $(srcdir)/libgcrypt.def
 
 install-def-file:
+	$(INSTALL) -d $(DESTDIR)$(libdir)
 	$(INSTALL) $(srcdir)/libgcrypt.def $(DESTDIR)$(libdir)/libgcrypt.def
 
 uninstall-def-file:
-------------- next part --------------
--- libgcrypt-1.5.0/doc/Makefile.am.orig	2012-09-12 03:23:56 +0400
+++ libgcrypt-1.5.0/doc/Makefile.am	2012-09-12 03:31:21 +0400
@@ -33,16 +33,16 @@
 
 
 .fig.png:
-	fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@
+	touch $@
 
 .fig.jpg:
-	fig2dev -L jpg `test -f '$<' || echo '$(srcdir)/'`$< $@
+	touch $@
 
 .fig.eps:
-	fig2dev -L eps `test -f '$<' || echo '$(srcdir)/'`$< $@
+	touch $@
 
 .fig.pdf:
-	fig2dev -L pdf `test -f '$<' || echo '$(srcdir)/'`$< $@
+	touch $@
 
 
 # Make sure that gcrypt.texi is touched if any other source file has
-------------- next part --------------
--- libgcrypt-1.5.0/src/libgcrypt.def.orig	2012-12-21 19:16:19 +0400
+++ libgcrypt-1.5.0/src/libgcrypt.def	2012-12-21 19:19:43 +0400
@@ -22,7 +22,6 @@
 ;; never be changed.  Also check libgcrypt.vers and visibility.h.
 
 
-EXPORTS
       gcry_check_version  @1
       gcry_control  @2
 


More information about the Gnupg-devel mailing list