Skip to content

Commit

Permalink
Avoid unportable -static-libgcc. Fixes OS X clang build.
Browse files Browse the repository at this point in the history
  • Loading branch information
schmonz committed Mar 3, 2019
1 parent 2d458a6 commit c04809c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions time/dateutils/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.10 2018/09/29 17:18:19 wiedi Exp $
$NetBSD: distinfo,v 1.11 2019/03/03 02:30:28 schmonz Exp $

SHA1 (dateutils-0.4.3.tar.xz) = a4a4e36ad3042665c8af3222126551b5c6bbb61a
RMD160 (dateutils-0.4.3.tar.xz) = ab629abea195ca853534bffd18353800ef4a2591
Expand All @@ -8,4 +8,4 @@ SHA1 (patch-Makefile.am) = 936ad7f986ff5cb8bec5f85c96a17657fca2774f
SHA1 (patch-Makefile.in) = ff5aaffb2046f17189b9074090c68295df5fb57a
SHA1 (patch-build-aux_yuck.c) = cd0be0ed0d0165f253165bff3609d8bcfaf1e67c
SHA1 (patch-configure) = 09afa4f5237d8bc20a0585e97d616f0830f80d7c
SHA1 (patch-m4_sxe-compiler.m4) = 8df17f891ba18ff54555e302388f0fe184fa33bc
SHA1 (patch-m4_sxe-compiler.m4) = 43900ecee585b60b5283c82da89ad141f6f3cd91
18 changes: 14 additions & 4 deletions time/dateutils/patches/patch-m4_sxe-compiler.m4
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
$NetBSD: patch-m4_sxe-compiler.m4,v 1.3 2016/09/19 05:33:15 mef Exp $
$NetBSD: patch-m4_sxe-compiler.m4,v 1.4 2019/03/03 02:30:28 schmonz Exp $

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

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

0 comments on commit c04809c

Please sign in to comment.