Codebase list erlang-asciideck / 3581f60
Fix FTBFS on kFreeBSD. (Closes: #871625) Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> Nobuhiro Iwamatsu 6 years ago
4 changed file(s) with 94 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
0 erlang-asciideck (0.0+git20170714.48cbfe8b-2) unstable; urgency=medium
1
2 * Fix FTBFS on kFreeBSD. (Closes: #871625)]
3 Add patches/0001-Add-support-kfreebsd.patch.
4
5 -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Fri, 25 Aug 2017 13:02:18 +0900
6
07 erlang-asciideck (0.0+git20170714.48cbfe8b-1) unstable; urgency=medium
18
29 * Initial release. (Closes: #868271)
0 From 9ec17fbc104cfc1e1f83da92e91dfb0d2f53d765 Mon Sep 17 00:00:00 2001
1 From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
2 Date: Fri, 25 Aug 2017 12:58:22 +0900
3 Subject: [PATCH 1/2] Add support kfreebsd
4
5 Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
6 ---
7 erlang.mk | 6 ++++++
8 1 file changed, 6 insertions(+)
9
10 diff --git a/erlang.mk b/erlang.mk
11 index 38bea99..1f9f188 100644
12 --- a/erlang.mk
13 +++ b/erlang.mk
14 @@ -81,6 +81,8 @@ else ifeq ($(UNAME_S),DragonFly)
15 PLATFORM = dragonfly
16 else ifeq ($(shell uname -o),Msys)
17 PLATFORM = msys2
18 +else ifeq ($(UNAME_S),GNU/kFreeBSD)
19 +PLATFORM = kfreebsd
20 else
21 $(error Unable to detect platform. Please open a ticket with the output of uname -a.)
22 endif
23 @@ -5817,6 +5819,10 @@ else ifeq ($(PLATFORM),linux)
24 CC ?= gcc
25 CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
26 CXXFLAGS ?= -O3 -finline-functions -Wall
27 +else ifeq ($(PLATFORM),kfreebsd)
28 + CC ?= gcc
29 + CFLAGS ?= -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes
30 + CXXFLAGS ?= -O2 -finline-functions -Wall
31 endif
32
33 ifneq ($(PLATFORM),msys2)
34 --
35 2.14.1
36
0 From 94eee524f3895fae0fccbe675c8a153f85643560 Mon Sep 17 00:00:00 2001
1 From: Nobuhiro Iwamatsu <iwamatsu@debian.org>
2 Date: Fri, 25 Aug 2017 13:00:52 +0900
3 Subject: [PATCH 2/2] Change optimize from O3 to O2
4
5 Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
6 ---
7 erlang.mk | 16 ++++++++--------
8 1 file changed, 8 insertions(+), 8 deletions(-)
9
10 diff --git a/erlang.mk b/erlang.mk
11 index 1f9f188..cf413cf 100644
12 --- a/erlang.mk
13 +++ b/erlang.mk
14 @@ -5804,21 +5804,21 @@ ifeq ($(PLATFORM),msys2)
15 # not produce working code. The "gcc" MSYS2 package also doesn't.
16 CC = /mingw64/bin/gcc
17 export CC
18 - CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
19 - CXXFLAGS ?= -O3 -finline-functions -Wall
20 + CFLAGS ?= -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes
21 + CXXFLAGS ?= -O2 -finline-functions -Wall
22 else ifeq ($(PLATFORM),darwin)
23 CC ?= cc
24 - CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
25 - CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
26 + CFLAGS ?= -O2 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
27 + CXXFLAGS ?= -O2 -arch x86_64 -finline-functions -Wall
28 LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
29 else ifeq ($(PLATFORM),freebsd)
30 CC ?= cc
31 - CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
32 - CXXFLAGS ?= -O3 -finline-functions -Wall
33 + CFLAGS ?= -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes
34 + CXXFLAGS ?= -O2 -finline-functions -Wall
35 else ifeq ($(PLATFORM),linux)
36 CC ?= gcc
37 - CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
38 - CXXFLAGS ?= -O3 -finline-functions -Wall
39 + CFLAGS ?= -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes
40 + CXXFLAGS ?= -O2 -finline-functions -Wall
41 else ifeq ($(PLATFORM),kfreebsd)
42 CC ?= gcc
43 CFLAGS ?= -O2 -std=c99 -finline-functions -Wall -Wmissing-prototypes
44 --
45 2.14.1
46
0 0001-Add-support-kfreebsd.patch
1 0002-Change-optimize-from-O3-to-O2.patch
2