Attachment 876124 Details for Bug 1077925 – Use system double-conversion instead of bundled one

[patch] Use system double-conversion instead of bundled one

Use-system-double-conversion-instead-of-bundled-on.patch (text/plain), 2.75 KB, created by Ville Skyttä on 2014-03-18 20:51:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-03-18 20:51:37 UTC

Size: 2.75 KB

patch

obsolete

>From fb942ecf050c85b381db176b626c762c3bcdf711 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Tue, 18 Mar 2014 22:49:49 +0200
>Subject: [PATCH] Use system double-conversion instead of bundled one
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1077925
>---
> erlang-jiffy.spec                    |  9 ++++++++-
> jiffy-system-double-conversion.patch | 20 ++++++++++++++++++++
> 2 files changed, 28 insertions(+), 1 deletion(-)
> create mode 100644 jiffy-system-double-conversion.patch
>
>diff --git a/erlang-jiffy.spec b/erlang-jiffy.spec
>index a4e7138..2cf49a2 100644
>--- a/erlang-jiffy.spec
>+++ b/erlang-jiffy.spec
>@@ -2,7 +2,7 @@
> 
> Name:           erlang-%{realname}
> Version:        0.8.5
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        Erlang JSON parser
> Group:          Development/Libraries
> License:        MIT
>@@ -10,10 +10,12 @@ URL:            https://github.com/davisp/jiffy
> Source0:        https://github.com/davisp/jiffy/archive/%{version}.tar.gz
> Patch0:         jiffy-setting-a-fixed-version.patch
> Patch1:         jiffy-cxxflags.patch
>+Patch2:         jiffy-system-double-conversion.patch
> 
> BuildRequires:  erlang >= R14B
> BuildRequires:  erlang-rebar
> BuildRequires:  gcc-c++
>+BuildRequires:  double-conversion-devel
> 
> Requires:       erlang-kernel%{?_isa}
> 
>@@ -28,6 +30,8 @@ A JSON parser for Erlang implemented as a NIF.
> %setup -q -n %{realname}-%{version}
> %patch0 -p1 -b .version
> %patch1 -p1 -b .cxxflags
>+%patch2 -p1 -b .system-double-conversion
>+rm -r c_src/double-conversion
> 
> 
> %build
>@@ -51,6 +55,9 @@ install -p priv/jiffy.so $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{vers
> 
> 
> %changelog
>+* Tue Mar 18 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 0.8.5-4
>+- Use system double-conversion instead of bundled one
>+
> * Wed Mar 12 2014 Lubomir Rintel (GoodData) <lubo.rintel@gooddata.com> - 0.8.5-3
> - Fix version number in version patch
> 
>diff --git a/jiffy-system-double-conversion.patch b/jiffy-system-double-conversion.patch
>new file mode 100644
>index 0000000..8424580
>--- /dev/null
>+++ b/jiffy-system-double-conversion.patch
>@@ -0,0 +1,20 @@
>+diff -up jiffy-0.8.5/rebar.config~ jiffy-0.8.5/rebar.config
>+--- jiffy-0.8.5/rebar.config~	2014-03-18 22:40:29.083883843 +0200
>++++ jiffy-0.8.5/rebar.config	2014-03-18 22:47:47.517790625 +0200
>+@@ -1,14 +1,13 @@
>+ {port_specs, [
>+     {"priv/jiffy.so", [
>+         "c_src/*.c",
>+-        "c_src/*.cc",
>+-        "c_src/double-conversion/*.cc"
>++        "c_src/*.cc"
>+     ]}
>+ ]}.
>+ 
>+ {port_env, [
>+     {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
>+-        "LDFLAGS", "$LDFLAGS -lstdc++"},
>++        "LDFLAGS", "$LDFLAGS -lstdc++ -ldouble-conversion"},
>+ 
>+     %% OS X Leopard flags for 64-bit
>+     {"darwin9.*-64$", "CXXFLAGS", "-m64"},
>-- 
>1.8.3.1

Actions: View | Diff

Attachments on bug 1077925: 876124