Attachment 152510 Details for Bug 197181 – The patch to update the port to the version 3.0.1

[patch] The patch to update the port to the version 3.0.1

gnu-efi.diff (text/plain), 4.99 KB, created by luca.pizzamiglio on 2015-02-03 10:43:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: luca.pizzamiglio

Created: 2015-02-03 10:43:12 UTC

Size: 4.99 KB

patch

obsolete

>Index: devel/gnu-efi/Makefile
>===================================================================
>--- devel/gnu-efi/Makefile	(revision 378306)
>+++ devel/gnu-efi/Makefile	(working copy)
>@@ -1,12 +1,13 @@
> # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
> # $FreeBSD$
> 
>+# TODO: LICENSE GPLv2? Not BSD as claimed by sourceforge?
>+# TODO: is gcc 4.9 not good?
> PORTNAME=	gnu-efi
>-PORTVERSION=	3.0w
>+PORTVERSION=	3.0.1
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	gnu-efi
>-DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
> 
> MAINTAINER=	trasz@FreeBSD.org
> COMMENT=	SDK for EFI applications
>@@ -13,16 +14,14 @@
> 
> LICENSE=	GPLv2
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-3.0
>-
>-USES=		gmake
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:${PORTSDIR}/devel/binutils
>+USES=		gmake tar:bz2
> # The version of GCC is also hard-coded in files/patch-Make.defaults.
>-USE_GCC=	4.8
>+USE_GCC=	4.8+
> MAKE_JOBS_UNSAFE=	yes
> CFLAGS+=	"-fPIC"
>+CPPFLAGS+=	"-fPIC"
>+MAKE_ARGS+=	INSTALLDIR=${STAGEDIR} PREFIX=${STAGEDIR}${LOCALBASE} CC=${CC} HOSTCC=${CC} AR=${AR}
> ONLY_FOR_ARCHS=	amd64
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults
>-
> .include <bsd.port.mk>
>Index: devel/gnu-efi/distinfo
>===================================================================
>--- devel/gnu-efi/distinfo	(revision 378306)
>+++ devel/gnu-efi/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (gnu-efi_3.0w.orig.tar.gz) = d5c5ca168d25bb54ea936a25175d7626778001f788bddc60dbed103874583621
>-SIZE (gnu-efi_3.0w.orig.tar.gz) = 172913
>+SHA256 (gnu-efi-3.0.1.tar.bz2) = e2e8d5940347eebfb00eaaeef107a8ba59e7838e40bc716c74d9a36fff648f1f
>+SIZE (gnu-efi-3.0.1.tar.bz2) = 136071
>Index: devel/gnu-efi/files/patch-Make.defaults
>===================================================================
>--- devel/gnu-efi/files/patch-Make.defaults	(revision 378306)
>+++ devel/gnu-efi/files/patch-Make.defaults	(working copy)
>@@ -1,43 +1,17 @@
>---- Make.defaults.orig	2014-08-08 21:27:21.000000000 +0200
>-+++ 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
>- #
>--INSTALLROOT  := /
>-+INSTALLROOT  := $(DESTDIR)
>- PREFIX       := /usr/local
>- LIBDIR 	     := $(PREFIX)/lib
>- INSTALL	     := install
>+--- Make.defaults.orig	2015-01-05 19:20:43.000000000 +0100
>++++ Make.defaults	2015-01-30 17:49:25.140109096 +0100
>+@@ -135,7 +138,7 @@
>+            -I$(TOPDIR)/inc/protocol
>  
>-+LOCALBASE    := /usr/local
>-+CROSS_COMPILE:= $(LOCALBASE)/bin/
>-+
>- # Compilation tools
>--HOSTCC       := $(prefix)gcc
>--CC           := $(prefix)$(CROSS_COMPILE)gcc
>-+HOSTCC       := $(prefix)%%CC%%
>-+CC           := $(prefix)$(CROSS_COMPILE)%%CC%%
>- AS           := $(prefix)$(CROSS_COMPILE)as
>- LD           := $(prefix)$(CROSS_COMPILE)ld
>- AR           := $(prefix)$(CROSS_COMPILE)ar
>-@@ -98,7 +101,7 @@ ifeq ($(ARCH),x86_64)
>-                                  && [ $(GCCMINOR) -ge "7" ] ) ) \
>-                           && echo 1)
>-   ifeq ($(GCCNEWENOUGH),1)
>--    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
>-+    CPPFLAGS += -fPIC -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
>-   endif
>- 
>-   CFLAGS += -mno-red-zone -mno-mmx -mno-sse
>-@@ -118,8 +121,8 @@ endif
>- # Generic compilation flags
>- INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
>-            -I$(TOPDIR)/inc/protocol
>+ ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
> -CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
> +CFLAGS  += $(ARCH3264) -O2 -fPIC -Wall -fshort-wchar -fno-strict-aliasing \
>-            -fno-merge-constants -ffreestanding -fno-stack-protector       \
>-            -fno-stack-check
>+            -ffreestanding -fno-stack-protector
>+ else
>+ CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
>+@@ -144,4 +147,4 @@
>+ endif
>+ 
>  ASFLAGS += $(ARCH3264)
> -LDFLAGS	+= -nostdlib --warn-common --no-undefined --fatal-warnings
> +LDFLAGS	+= -nostdlib
>Index: devel/gnu-efi/files/patch-gnuefi-Makefile
>===================================================================
>--- devel/gnu-efi/files/patch-gnuefi-Makefile	(revision 378306)
>+++ devel/gnu-efi/files/patch-gnuefi-Makefile	(working copy)
>@@ -8,17 +8,3 @@
> +
>  # on aarch64, avoid jump tables before all relocations have been processed
>  reloc_aarch64.o: CFLAGS += -fno-jump-tables
>- 
>-@@ -77,9 +79,8 @@ $(LIBDIRINSTALL):
>- 
>- .SECONDEXPANSION:
>- 
>--$(LIBDIRINSTALL)/%: % | $$(dir $$@)
>--	$(INSTALL) -m 644 $< $(dir $@)
>--
>--install: $(addprefix $(LIBDIRINSTALL)/,$(INSTALLTARGETS))
>-+install: $(INSTALLTARGETS)
>-+	echo targets $(INSTALLTARGETS)
>-+	$(INSTALL) -m 644 $(INSTALLTARGETS) $(LIBDIRINSTALL)
>- 
>- include $(SRCDIR)/../Make.rules
>Index: devel/gnu-efi/pkg-plist
>===================================================================
>--- devel/gnu-efi/pkg-plist	(revision 378306)
>+++ devel/gnu-efi/pkg-plist	(working copy)
>@@ -44,4 +44,3 @@
> lib/elf_x86_64_fbsd_efi.lds
> lib/libefi.a
> lib/libgnuefi.a
>-@dir include/efi/protocol/x86_64

Actions: View | Diff

Attachments on bug 197181: 152344 | 152510 | 152511