Date: Sun, 5 Feb 2017 04:36:22 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433350 - in head/sysutils/shim: . files Message-ID: <201702050436.v154aMFn064410@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Feb 5 04:36:22 2017 New Revision: 433350 URL: https://svnweb.freebsd.org/changeset/ports/433350 Log: sysutils/shim: unbreak with gcc5 or later In file included from /usr/local/include/efi/efi.h:35:0, from shim.c:36: /usr/local/include/efi/x86_64/efibind.h:88:24: fatal error: stdint.h: No such file or directory PR: 216707 Reported by: antoine (via exp-run) Modified: head/sysutils/shim/Makefile (contents, props changed) head/sysutils/shim/files/patch-Makefile (contents, props changed) Modified: head/sysutils/shim/Makefile ============================================================================== --- head/sysutils/shim/Makefile Sun Feb 5 04:30:11 2017 (r433349) +++ head/sysutils/shim/Makefile Sun Feb 5 04:36:22 2017 (r433350) @@ -18,8 +18,10 @@ USE_GITHUB= yes GH_ACCOUNT= mjg59 USES= gmake +USE_CSTD= gnu89 USE_GCC= yes USE_GITHUB= yes +MAKE_ARGS= CC="${CC} ${CFLAGS:M-std=*}" LD="${LD}" OBJCOPY="${OBJCOPY}" MAKE_JOBS_UNSAFE= yes ONLY_FOR_ARCHS= amd64 @@ -28,7 +30,6 @@ PLIST_FILES= lib/shim/shim.pem lib/shim/ post-patch: @${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/make-certs - @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Makefile do-install: # Note that before this step, the shim.pem contains the _private_ key. Modified: head/sysutils/shim/files/patch-Makefile ============================================================================== --- head/sysutils/shim/files/patch-Makefile Sun Feb 5 04:30:11 2017 (r433349) +++ head/sysutils/shim/files/patch-Makefile Sun Feb 5 04:36:22 2017 (r433350) @@ -1,12 +1,6 @@ --- Makefile.orig 2014-10-13 22:41:51.000000000 +0200 +++ Makefile 2014-12-21 16:18:40.000000000 +0100 -@@ -1,16 +1,22 @@ --CC = $(CROSS_COMPILE)gcc -+CROSS_COMPILE = $(LOCALBASE)/bin/ -+ -+CC = $(CROSS_COMPILE)%%CC%% - LD = $(CROSS_COMPILE)ld - OBJCOPY = $(CROSS_COMPILE)objcopy +@@ -4,13 +1,17 @@ ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702050436.v154aMFn064410>