Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update libyaml 0.1.4 with patch from Hiroshi Shirosaki

It requires autoreconf to regenerate configure prior calling it.
  • Loading branch information...
commit 90eef1b904b82d81587c2a24f592398aeacde74c 1 parent 13704b3
@luislavena luislavena authored
View
27 libyaml/0001-Proper-mingw-YAML_DECLARE-definition.patch
@@ -1,27 +0,0 @@
-From 37a8ce4e439887f7856ad70ca71e2fe6820e37fd Mon Sep 17 00:00:00 2001
-From: Bosko Ivanisevic <bosko.ivanisevic@gmail.com>
-Date: Wed, 6 Jul 2011 09:22:29 +0200
-Subject: [PATCH] Proper mingw YAML_DECLARE definition
-
----
- include/yaml.h | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/include/yaml.h b/include/yaml.h
-index 400cae1..c6e8b71 100644
---- a/include/yaml.h
-+++ b/include/yaml.h
-@@ -26,7 +26,9 @@ extern "C" {
-
- /** The public API declaration. */
-
--#ifdef _WIN32
-+#if defined(__MINGW32__)
-+# define YAML_DECLARE(type) type
-+#elif defined(_WIN32)
- # if defined(YAML_DECLARE_STATIC)
- # define YAML_DECLARE(type) type
- # elif defined(YAML_DECLARE_EXPORT)
---
-1.7.0.2.msysgit.0
-
View
41 libyaml/0001-build-shared-library-under-mingw.diff
@@ -0,0 +1,41 @@
+diff --git a/configure.ac b/configure.ac
+index f0fa397..067bb58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,6 +58,13 @@ AC_PROG_LIBTOOL
+ AC_CHECK_PROG(DOXYGEN, [doxygen], [true], [false])
+ AM_CONDITIONAL(DOXYGEN, [test "$DOXYGEN" = true])
+
++# Checks for host
++AS_CASE(["$host_os"],
++[mingw*], [
++ YAML_LT_LDFLAGS='-no-undefined';
++])
++AC_SUBST(YAML_LT_LDFLAGS)
++
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([stdlib.h])
+diff --git a/include/yaml.h b/include/yaml.h
+index 5a04d36..70d839e 100644
+--- a/include/yaml.h
++++ b/include/yaml.h
+@@ -29,7 +29,7 @@ extern "C" {
+ #ifdef _WIN32
+ # if defined(YAML_DECLARE_STATIC)
+ # define YAML_DECLARE(type) type
+-# elif defined(YAML_DECLARE_EXPORT)
++# elif defined(YAML_DECLARE_EXPORT) || defined(DLL_EXPORT)
+ # define YAML_DECLARE(type) __declspec(dllexport) type
+ # else
+ # define YAML_DECLARE(type) __declspec(dllimport) type
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 724a1b2..be92df5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ lib_LTLIBRARIES = libyaml.la
+ libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
+-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
++libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) $(YAML_LT_LDFLAGS)
View
4 libyaml/libyaml-0.1.4.knapfile
@@ -4,4 +4,8 @@ recipe "libyaml", "0.1.4" do
fetch "http://distfiles.openknapsack.org/#{name}/yaml-#{version}.tar.gz",
:md5 => "36c852831d02cf90508c29852361d01b"
+
+ before :configure do
+ run "sh -c 'autoreconf -ivf'"
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.