Skip to content

Commit c04809c

Browse files
committed
Avoid unportable -static-libgcc. Fixes OS X clang build.
1 parent 2d458a6 commit c04809c

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

time/dateutils/distinfo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$NetBSD: distinfo,v 1.10 2018/09/29 17:18:19 wiedi Exp $
1+
$NetBSD: distinfo,v 1.11 2019/03/03 02:30:28 schmonz Exp $
22

33
SHA1 (dateutils-0.4.3.tar.xz) = a4a4e36ad3042665c8af3222126551b5c6bbb61a
44
RMD160 (dateutils-0.4.3.tar.xz) = ab629abea195ca853534bffd18353800ef4a2591
@@ -8,4 +8,4 @@ SHA1 (patch-Makefile.am) = 936ad7f986ff5cb8bec5f85c96a17657fca2774f
88
SHA1 (patch-Makefile.in) = ff5aaffb2046f17189b9074090c68295df5fb57a
99
SHA1 (patch-build-aux_yuck.c) = cd0be0ed0d0165f253165bff3609d8bcfaf1e67c
1010
SHA1 (patch-configure) = 09afa4f5237d8bc20a0585e97d616f0830f80d7c
11-
SHA1 (patch-m4_sxe-compiler.m4) = 8df17f891ba18ff54555e302388f0fe184fa33bc
11+
SHA1 (patch-m4_sxe-compiler.m4) = 43900ecee585b60b5283c82da89ad141f6f3cd91

time/dateutils/patches/patch-m4_sxe-compiler.m4

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
$NetBSD: patch-m4_sxe-compiler.m4,v 1.3 2016/09/19 05:33:15 mef Exp $
1+
$NetBSD: patch-m4_sxe-compiler.m4,v 1.4 2019/03/03 02:30:28 schmonz Exp $
22

33
Don't create broken or non-portable binaries. This code isn't even
44
performance critical.
55

6-
--- m4/sxe-compiler.m4~ 2016-05-20 17:25:12.000000000 +0900
7-
+++ m4/sxe-compiler.m4 2016-09-19 14:25:55.000000000 +0900
8-
@@ -501,7 +501,6 @@ dnl + native[=yes|no] Emit the --enable
6+
--- m4/sxe-compiler.m4.orig 2018-03-01 09:55:48.000000000 +0000
7+
+++ m4/sxe-compiler.m4
8+
@@ -446,9 +446,6 @@ AC_DEFUN([SXE_FEATFLAGS], [dnl
9+
SXE_CHECK_COMPILER_FLAG([-static-intel], [
10+
featflags="${featflags} -static-intel"
11+
XCCLDFLAGS="${XCCLDFLAGS} \${XCCFLAG} -static-intel"], [:])
12+
- SXE_CHECK_COMPILER_FLAG([-static-libgcc], [
13+
- featflags="${featflags} -static-libgcc"
14+
- XCCLDFLAGS="${XCCLDFLAGS} \${XCCFLAG} -static-libgcc"], [:])
15+
16+
SXE_CHECK_COMPILER_FLAG([-intel-extensions], [dnl
17+
featflags="${featflags} -intel-extensions"])
18+
@@ -501,7 +498,6 @@ dnl + native[=yes|no] Emit the --enable
919
## Use either command line flag, environment var, or autodetection
1020
SXE_DEBUGFLAGS
1121
SXE_WARNFLAGS

0 commit comments

Comments
 (0)