diff options
Diffstat (limited to 'devel/gnu-efi')
| -rw-r--r-- | devel/gnu-efi/Makefile | 5 | ||||
| -rw-r--r-- | devel/gnu-efi/distinfo | 6 | ||||
| -rw-r--r-- | devel/gnu-efi/files/patch-Make.defaults | 32 | ||||
| -rw-r--r-- | devel/gnu-efi/files/patch-Makefile | 6 | ||||
| -rw-r--r-- | devel/gnu-efi/files/patch-gnuefi-Makefile | 11 | ||||
| -rw-r--r-- | devel/gnu-efi/pkg-plist | 1 |
6 files changed, 13 insertions, 48 deletions
diff --git a/devel/gnu-efi/Makefile b/devel/gnu-efi/Makefile index 4ecf4e389166..6484fba93b19 100644 --- a/devel/gnu-efi/Makefile +++ b/devel/gnu-efi/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnu-efi -PORTVERSION= 3.0.15 +PORTVERSION= 3.0.18 CATEGORIES= devel MASTER_SITES= SF/gnu-efi @@ -15,8 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/ar:devel/binutils USES= compiler:c++11-lib gmake tar:bz2 -CFLAGS+= -fPIC -CPPFLAGS+= -fPIC +CPPFLAGS+= -Wno-incompatible-pointer-types MAKE_ARGS+= CC=${CC} HOSTCC=${CC} AR=${AR} .include <bsd.port.pre.mk> diff --git a/devel/gnu-efi/distinfo b/devel/gnu-efi/distinfo index 79a5795cb157..86e83074b09e 100644 --- a/devel/gnu-efi/distinfo +++ b/devel/gnu-efi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665840365 -SHA256 (gnu-efi-3.0.15.tar.bz2) = 931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea -SIZE (gnu-efi-3.0.15.tar.bz2) = 159399 +TIMESTAMP = 1726829400 +SHA256 (gnu-efi-3.0.18.tar.bz2) = 7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c +SIZE (gnu-efi-3.0.18.tar.bz2) = 167567 diff --git a/devel/gnu-efi/files/patch-Make.defaults b/devel/gnu-efi/files/patch-Make.defaults index 68fcca4b0c84..8d0d6b7ee7a7 100644 --- a/devel/gnu-efi/files/patch-Make.defaults +++ b/devel/gnu-efi/files/patch-Make.defaults @@ -1,14 +1,8 @@ ---- Make.defaults.orig 2019-10-28 11:48:52 UTC +--- Make.defaults.orig 2024-03-22 13:38:35 UTC +++ Make.defaults -@@ -45,11 +45,14 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PW - # 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 +@@ -64,6 +64,9 @@ INSTALL := install + INCLUDEDIR := $(PREFIX)/include + INSTALL := install +LOCALBASE := /usr/local +CROSS_COMPILE:= $(LOCALBASE)/bin/ @@ -16,21 +10,3 @@ # Compilation tools HOSTCC := $(prefix)gcc CC := $(prefix)$(CROSS_COMPILE)gcc -@@ -110,10 +113,14 @@ ifeq ($(ARCH),x86_64) - || ( [ $(GCCVERSION) -eq "4" ] \ - && [ $(GCCMINOR) -ge "7" ] ) ) \ - && echo 1) -- ifeq ($(GCCNEWENOUGH),1) -- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -- else ifeq ($(USING_CLANG),clang) -+ ifeq ($(USING_CLANG),clang) - CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 -+ else -+ ifeq ($(GCCNEWENOUGH),1) -+ CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -+ else -+ CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11 -+ endif - endif - - CFLAGS += -mno-red-zone diff --git a/devel/gnu-efi/files/patch-Makefile b/devel/gnu-efi/files/patch-Makefile index 5800b4eb1fb9..a454e34ba2a5 100644 --- a/devel/gnu-efi/files/patch-Makefile +++ b/devel/gnu-efi/files/patch-Makefile @@ -1,11 +1,11 @@ ---- Makefile.orig 2015-08-17 20:06:47 UTC +--- Makefile.orig 2024-03-22 13:38:35 UTC +++ Makefile -@@ -42,7 +42,7 @@ VPATH = $(SRCDIR) +@@ -43,7 +43,7 @@ include $(SRCDIR)/Make.defaults include $(SRCDIR)/Make.defaults -SUBDIRS = lib gnuefi inc apps +SUBDIRS = lib gnuefi inc - gnuefi: lib all: check_gcc $(SUBDIRS) + diff --git a/devel/gnu-efi/files/patch-gnuefi-Makefile b/devel/gnu-efi/files/patch-gnuefi-Makefile deleted file mode 100644 index 92b199fce135..000000000000 --- a/devel/gnu-efi/files/patch-gnuefi-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- gnuefi/Makefile.orig 2015-08-17 20:06:47 UTC -+++ gnuefi/Makefile -@@ -47,6 +47,8 @@ FILES = reloc_$(ARCH) - - OBJS = $(FILES:%=%.o) - -+CFLAGS += -fPIC -+ - # on aarch64, avoid jump tables before all relocations have been processed - reloc_aarch64.o: CFLAGS += -fno-jump-tables - diff --git a/devel/gnu-efi/pkg-plist b/devel/gnu-efi/pkg-plist index 65109d4d0f91..5356b9243771 100644 --- a/devel/gnu-efi/pkg-plist +++ b/devel/gnu-efi/pkg-plist @@ -43,6 +43,7 @@ include/efi/protocol/vgaclass.h include/efi/romload.h lib/libefi.a lib/libgnuefi.a +libdata/pkgconfig/gnu-efi.pc @comment Architecture Specific Packages List, amd64 %%ARCH_amd64%%include/efi/x86_64/efibind.h %%ARCH_amd64%%include/efi/x86_64/efilibplat.h |