Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jan 2015 13:48:36 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r377608 - in head/sysutils/shim: . files
Message-ID:  <201501211348.t0LDmajv013945@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Wed Jan 21 13:48:36 2015
New Revision: 377608
URL: https://svnweb.freebsd.org/changeset/ports/377608
QAT: https://qat.redports.org/buildarchive/r377608/

Log:
  Don't hardcode "gcc48"; it would break after GCC upgrade.  Don't install
  *.efi files as executables; from the strip(1) point of view they are data
  files (actually, they are executables, but PE, not ELF).
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sysutils/shim/Makefile
  head/sysutils/shim/files/patch-Makefile

Modified: head/sysutils/shim/Makefile
==============================================================================
--- head/sysutils/shim/Makefile	Wed Jan 21 13:41:46 2015	(r377607)
+++ head/sysutils/shim/Makefile	Wed Jan 21 13:48:36 2015	(r377608)
@@ -27,11 +27,12 @@ PLIST_FILES=	lib/shim/MokManager.efi lib
 
 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:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/shim
-	${INSTALL_PROGRAM} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim
-	${INSTALL_PROGRAM} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim
-	${INSTALL_PROGRAM} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/shim.efi ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/MokManager.efi ${STAGEDIR}/${PREFIX}/lib/shim
+	${INSTALL_DATA} ${WRKSRC}/fallback.efi ${STAGEDIR}/${PREFIX}/lib/shim
 
 .include <bsd.port.mk>

Modified: head/sysutils/shim/files/patch-Makefile
==============================================================================
--- head/sysutils/shim/files/patch-Makefile	Wed Jan 21 13:41:46 2015	(r377607)
+++ head/sysutils/shim/files/patch-Makefile	Wed Jan 21 13:48:36 2015	(r377608)
@@ -4,7 +4,7 @@
 -CC		= $(CROSS_COMPILE)gcc
 +CROSS_COMPILE	= $(LOCALBASE)/bin/
 +
-+CC		= $(CROSS_COMPILE)gcc48
++CC		= $(CROSS_COMPILE)%%CC%%
  LD		= $(CROSS_COMPILE)ld
  OBJCOPY		= $(CROSS_COMPILE)objcopy
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501211348.t0LDmajv013945>