Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jan 2015 13:20:23 +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: r377600 - in head/devel/gnu-efi: . files
Message-ID:  <201501211320.t0LDKNpO098738@svn.freebsd.org>

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

Log:
  Don't hardcode "gcc48"; it would break after GCC upgrade.
  
  Submitted by:	kwm@

Modified:
  head/devel/gnu-efi/Makefile
  head/devel/gnu-efi/files/patch-Make.defaults

Modified: head/devel/gnu-efi/Makefile
==============================================================================
--- head/devel/gnu-efi/Makefile	Wed Jan 21 13:11:28 2015	(r377599)
+++ head/devel/gnu-efi/Makefile	Wed Jan 21 13:20:22 2015	(r377600)
@@ -22,4 +22,7 @@ MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	"-fPIC"
 ONLY_FOR_ARCHS=	amd64
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults
+
 .include <bsd.port.mk>

Modified: head/devel/gnu-efi/files/patch-Make.defaults
==============================================================================
--- head/devel/gnu-efi/files/patch-Make.defaults	Wed Jan 21 13:11:28 2015	(r377599)
+++ head/devel/gnu-efi/files/patch-Make.defaults	Wed Jan 21 13:20:22 2015	(r377600)
@@ -1,5 +1,5 @@
 --- Make.defaults.orig	2014-08-08 21:27:21.000000000 +0200
-+++ Make.defaults	2014-12-01 02:18:02.000000000 +0100
++++ Make.defaults	2015-01-15 11:13:35.059134709 +0100
 @@ -45,14 +45,17 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; 
  # Where to install the package. GNU-EFI will create and access
  # lib and include under the root
@@ -16,8 +16,8 @@
  # Compilation tools
 -HOSTCC       := $(prefix)gcc
 -CC           := $(prefix)$(CROSS_COMPILE)gcc
-+HOSTCC       := $(prefix)gcc48
-+CC           := $(prefix)$(CROSS_COMPILE)gcc48
++HOSTCC       := $(prefix)%%CC%%
++CC           := $(prefix)$(CROSS_COMPILE)%%CC%%
  AS           := $(prefix)$(CROSS_COMPILE)as
  LD           := $(prefix)$(CROSS_COMPILE)ld
  AR           := $(prefix)$(CROSS_COMPILE)ar



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