[Pkg-gnupg-commit] [libassuan] 02/04: clean up linker script for libassuan when building for win32

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch debian-windows
in repository libassuan.

commit fd5b762cd66418969b26210b07acdc3aa3dcbf80
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Feb 14 11:16:22 2016 -0500

    clean up linker script for libassuan when building for win32
---
 ...nker-errors-when-cross-building-for-win32.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch b/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch
new file mode 100644
index 0000000..dbb0c12
--- /dev/null
+++ b/debian/patches/0001-avoid-linker-errors-when-cross-building-for-win32.patch
@@ -0,0 +1,38 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Sun, 14 Feb 2016 11:14:12 -0500
+Subject: avoid linker errors when cross-building for win32
+
+Without this fix, we see the following problem when trying to link the
+assuan library on win32:
+
+libtool: link: /usr/bin/i686-w64-mingw32-nm -B  .libs/libassuan_la-assuan.o .libs/libassuan_la-context.o .libs/libassuan_la-system.o .libs/libassuan_la-debug.o .libs/libassuan_la-conversion.o .libs/libassuan_la-sysutils.o .libs/libassuan_la-client.o .libs/libassuan_la-server.o .libs/libassuan_la-assuan-error.o .libs/libassuan_la-assuan-buffer.o .libs/libassuan_la-assuan-handler.o .libs/libassuan_la-assuan-inquire.o .libs/libassuan_la-assuan-listen.o .libs/libassuan_la-assuan-pipe-server. [...]
+libtool: link: if test "x`/bin/sed 1q .libs/libassuan.def`" = xEXPORTS; then cp .libs/libassuan.def .libs/libassuan-0.dll.def; else echo EXPORTS > .libs/libassuan-0.dll.def; cat .libs/libassuan.def >> .libs/libassuan-0.dll.def; fi
+libtool: link:  i686-w64-mingw32-gcc -shared .libs/libassuan-0.dll.def  .libs/libassuan_la-assuan.o .libs/libassuan_la-context.o .libs/libassuan_la-system.o .libs/libassuan_la-debug.o .libs/libassuan_la-conversion.o .libs/libassuan_la-sysutils.o .libs/libassuan_la-client.o .libs/libassuan_la-server.o .libs/libassuan_la-assuan-error.o .libs/libassuan_la-assuan-buffer.o .libs/libassuan_la-assuan-handler.o .libs/libassuan_la-assuan-inquire.o .libs/libassuan_la-assuan-listen.o .libs/libassua [...]
+/usr/bin/i686-w64-mingw32-ld: .libs/libassuan-0.dll.def:5: syntax error
+/usr/bin/i686-w64-mingw32-ld:.libs/libassuan-0.dll.def: file format not recognized; treating as linker script
+/usr/bin/i686-w64-mingw32-ld:.libs/libassuan-0.dll.def:2: syntax error
+collect2: error: ld returned 1 exit status
+Makefile:566: recipe for target 'libassuan.la' failed
+make[5]: *** [libassuan.la] Error 1
+make[5]: Leaving directory '/home/dkg/src/pkg-gnupg/libassuan/build-win32/src'
+---
+ src/libassuan.def | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libassuan.def b/src/libassuan.def
+index c320151..dfce924 100644
+--- a/src/libassuan.def
++++ b/src/libassuan.def
+@@ -1,3 +1,4 @@
++EXPORTS
+ ; assuan.def - List of symbols to export.
+ ; Copyright (C) 2005, 2009 g10 Code GmbH
+ ;
+@@ -18,7 +19,6 @@
+ ; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ 
+ 
+-EXPORTS
+     assuan_accept			@1
+     assuan_begin_confidential		@2
+     assuan_close_input_fd		@3
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..26cf27d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-avoid-linker-errors-when-cross-building-for-win32.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git