Mercurial > mxe-octave
changeset 3082:fae995570da2
[MSVC] enable libidn compilation
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sun, 23 Jun 2013 23:33:40 -0400 |
| parents | 71ca96663e2c |
| children | 1f1e0dc9a135 |
| files | src/libidn.mk src/msvc-libidn-1.patch |
| diffstat | 2 files changed, 83 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libidn.mk Sun Jun 23 23:33:40 2013 -0400 +++ b/src/libidn.mk Sun Jun 23 23:33:40 2013 -0400 @@ -23,6 +23,6 @@ $(ENABLE_SHARED_OR_STATIC) \ --disable-csharp \ --prefix='$(HOST_PREFIX)' \ - --with-libiconv-prefix='$(HOST_PREFIX)' + --with-libiconv-prefix='$(HOST_PREFIX)' && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/msvc-libidn-1.patch Sun Jun 23 23:33:40 2013 -0400 @@ -0,0 +1,82 @@ +diff -ur libidn-1.25-orig/examples/example.c libidn-1.25/examples/example.c +--- libidn-1.25-orig/examples/example.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example.c 2013-06-23 15:49:49 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff -ur libidn-1.25-orig/examples/example2.c libidn-1.25/examples/example2.c +--- libidn-1.25-orig/examples/example2.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example2.c 2013-06-23 15:50:00 -0400 +@@ -19,6 +19,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include <locale.h> /* setlocale() */ + + /* +diff -ur libidn-1.25-orig/examples/example3.c libidn-1.25/examples/example3.c +--- libidn-1.25-orig/examples/example3.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example3.c 2013-06-23 15:50:06 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff -ur libidn-1.25-orig/examples/example4.c libidn-1.25/examples/example4.c +--- libidn-1.25-orig/examples/example4.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example4.c 2013-06-23 15:50:12 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff -ur libidn-1.25-orig/examples/example5.c libidn-1.25/examples/example5.c +--- libidn-1.25-orig/examples/example5.c 2012-04-27 06:48:08 -0400 ++++ libidn-1.25/examples/example5.c 2013-06-23 15:50:18 -0400 +@@ -18,6 +18,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff -ur libidn-1.25-orig/lib/Makefile.in libidn-1.25/lib/Makefile.in +--- libidn-1.25-orig/lib/Makefile.in 2012-05-23 04:36:47 -0400 ++++ libidn-1.25/lib/Makefile.in 2013-06-23 15:49:18 -0400 +@@ -1090,7 +1090,7 @@ + $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined \ + $(am__append_3) $(am__append_4) $(am__append_5) + @HAVE_LD_OUTPUT_DEF_TRUE@defexecdir = $(bindir) +-@HAVE_LD_OUTPUT_DEF_TRUE@defexec_DATA = libidn-$(DLL_VERSION).def ++@HAVE_LD_OUTPUT_DEF_TRUE@#defexec_DATA = libidn-$(DLL_VERSION).def + @HAVE_LD_OUTPUT_DEF_TRUE@CLEANFILES = $(defexec_DATA) + SPEC = $(top_srcdir)/doc/specifications + all: $(BUILT_SOURCES)