summaryrefslogtreecommitdiff
path: root/external/libassuan/w32-build-fixes.patch.1
blob: c9250c4e557306644d673be99a5d0c15f86a3fc7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
--- libassuan.orig/src/Makefile.in	2017-09-15 08:16:41.601057500 +0200
+++ libassuan/src/Makefile.in	2017-09-24 13:01:24.950711300 +0200
@@ -424,7 +424,7 @@
 nodist_include_HEADERS = assuan.h
 @HAVE_LD_VERSION_SCRIPT_FALSE@libassuan_version_script_cmd = 
 @HAVE_LD_VERSION_SCRIPT_TRUE@libassuan_version_script_cmd = -Wl,--version-script=$(srcdir)/libassuan.vers
-CLEANFILES = mkheader assuan.h
+CLEANFILES = mkheader$(EXEEXT) assuan.h
 BUILT_SOURCES = assuan.h
 parts_of_assuan_h = \
 	posix-includes.inc.h   w32-includes.inc.h \
@@ -1183,10 +1183,10 @@
 @HAVE_W32CE_SYSTEM_TRUE@	mv -f $(DESTDIR)$(bindir)/libgpgcedev-0.dll \
 @HAVE_W32CE_SYSTEM_TRUE@              $(DESTDIR)$(bindir)/gpgcedev.dll
 
-mkheader: mkheader.c Makefile
+mkheader$(EXEEXT): mkheader.c Makefile
 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
 
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
 	./mkheader $(host_os) $(srcdir)/assuan.h.in \
                    @VERSION@ @VERSION_NUMBER@ >$@
 
--- libassuan.orig/src/mkheader.c	2013-03-15 20:26:09.000000000 +0100
+++ libassuan/src/mkheader.c	2017-09-24 14:17:33.584583300 +0200
@@ -99,7 +99,7 @@
                "# include <unistd.h>\n"
                "#endif\n", stdout);
       else
-        fputs ("#include <unistd.h>\n", stdout);
+        fputs ("#include <io.h>\n", stdout);
     }
   else if (!strcmp (tag, "include:types"))
     {
diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am
--- libassuan.orig/src/Makefile.am	2017-09-24 14:20:05.906065400 +0200
+++ libassuan/src/Makefile.am	2017-09-24 14:40:59.038850200 +0200
@@ -142,11 +142,11 @@
               $(DESTDIR)$(bindir)/gpgcedev.dll
 endif
 
-mkheader: mkheader.c Makefile
+mkheader$(EXEEXT): mkheader.c Makefile
 	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
 
-assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
-	./mkheader $(host_os) $(srcdir)/assuan.h.in \
+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
+	./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
                    @VERSION@ @VERSION_NUMBER@ >$@
 
 
diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
--- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.000000000 +0200
+++ libassuan/src/assuan-handler.c      2017-09-24 15:32:51.200956200 +0200
@@ -395,7 +395,7 @@

   { "INPUT",  std_handler_input, std_help_input, 0 },
   { "OUTPUT", std_handler_output, std_help_output, 0 },
-  { } };
+};


 /**
diff -ru libassuan.orig/Makefile.am libassuan/Makefile.am
--- libassuan.orig/Makefile.am	2016-07-14 10:09:22.000000000 +0200
+++ libassuan/Makefile.am	2017-09-25 21:20:19.928317500 +0200
@@ -28,7 +28,7 @@
              tests/ChangeLog-2011 contrib/ChangeLog-2011     		\
              build-aux/git-log-footer build-aux/git-log-fix
 
-SUBDIRS = m4 src doc tests
+SUBDIRS = m4 src doc
 
 
 dist-hook: gen-ChangeLog