Mercurial > mxe-octave

changeset 3083:1f1e0dc9a135

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable libgpg_error compilation and update to 1.11
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 23 Jun 2013 23:33:41 -0400
parents fae995570da2
children 6f7c1f4e9b2b
files index.html src/libgpg_error.mk src/msvc-libgpg_error-1.patch
diffstat 3 files changed, 58 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sun Jun 23 23:33:40 2013 -0400
+++ b/index.html	Sun Jun 23 23:33:41 2013 -0400
@@ -1490,7 +1490,7 @@
     </tr>
     <tr>
         <td id="libgpg_error-package">libgpg_error</td>
-        <td id="libgpg_error-version">1.10</td>
+        <td id="libgpg_error-version">1.11</td>
         <td id="libgpg_error-website"><a href="ftp://ftp.gnupg.org/gcrypt/libgpg-error/">libgpg-error</a></td>
     </tr>
     <tr>
--- a/src/libgpg_error.mk	Sun Jun 23 23:33:40 2013 -0400
+++ b/src/libgpg_error.mk	Sun Jun 23 23:33:41 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 95b324359627fbcb762487ab6091afbe59823b29
+$(PKG)_CHECKSUM := be209b013652add5c7e2c473ea114f58203cc6cd
 $(PKG)_SUBDIR   := libgpg-error-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgpg-error-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
@@ -22,7 +22,7 @@
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
-        --disable-languages
+        --disable-languages && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(LN_SF) '$(HOST_BINDIR)/gpg-error-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gpg-error-config'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/msvc-libgpg_error-1.patch	Sun Jun 23 23:33:41 2013 -0400
@@ -0,0 +1,55 @@
+diff -ur libgpg-error-1.11-orig/src/Makefile.in libgpg-error-1.11/src/Makefile.in
+--- libgpg-error-1.11-orig/src/Makefile.in	2013-02-25 04:27:23 -0500
++++ libgpg-error-1.11/src/Makefile.in	2013-06-23 17:11:24 -0400
+@@ -999,7 +999,7 @@
+ gpg-error.def: Makefile gpg-error.def.in
+ 	cat $(srcdir)/gpg-error.def.in >_$@.h
+ 	$(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \
+-	  grep -v '^#' >$@
++	  grep -v '^#' | sed -e '/^$$/d' -e 's/^ *\([^ ]*\).*/\1/' >$@
+ 	-rm _$@.h
+ 
+ # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
+diff -ur libgpg-error-1.11-orig/src/gpg-error.c libgpg-error-1.11/src/gpg-error.c
+--- libgpg-error-1.11-orig/src/gpg-error.c	2010-12-23 11:56:07 -0500
++++ libgpg-error-1.11/src/gpg-error.c	2013-06-23 17:11:56 -0400
+@@ -51,6 +51,11 @@
+ 
+ #include <gpg-error.h>
+ 
++#ifdef _MSC_VER
++# define strcasecmp stricmp
++# define strncasecmp strnicmp
++#endif
++
+ 
+ #if HAVE_W32_SYSTEM
+ /* The implementation follows below.  */
+diff -ur libgpg-error-1.11-orig/src/init.c libgpg-error-1.11/src/init.c
+--- libgpg-error-1.11-orig/src/init.c	2010-12-23 11:56:07 -0500
++++ libgpg-error-1.11/src/init.c	2013-06-23 17:11:32 -0400
+@@ -42,6 +42,10 @@
+ # endif
+ #endif
+ 
++#ifdef _MSC_VER
++# define snprintf _snprintf
++#endif
++
+ 
+ /* Locale directory support.  */
+ 
+diff -ur libgpg-error-1.11-orig/src/strerror.c libgpg-error-1.11/src/strerror.c
+--- libgpg-error-1.11-orig/src/strerror.c	2010-12-23 11:56:07 -0500
++++ libgpg-error-1.11/src/strerror.c	2013-06-23 17:11:42 -0400
+@@ -32,6 +32,10 @@
+ #include "gettext.h"
+ #include "err-codes.h"
+ 
++#ifdef _MSC_VER
++# define snprintf _snprintf
++#endif
++
+ /* Return a pointer to a string containing a description of the error
+    code in the error value ERR.  This function is not thread-safe.  */
+ const char *