From nobody Sat Oct 11 12:16:39 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ckMzX1QnGz6Blxj; Sat, 11 Oct 2025 12:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ckMzX0xK1z3tvh; Sat, 11 Oct 2025 12:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760185000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qv+eD81EU87Yi5FfjbjjnK5fT/4jfEFX/mRXV0npVa0=; b=JFqfChd9pS5flXxiRA5qjQM0GUhL7fDSPquO/JT8OJoA8geI0NLSe7wp0KIgxux4yPw1pM PKCqPeWZdavuYxy1DpbO3VxWorOFPzqS7lTM95qM6SPgzGiROEhcS+iYRgnGOM74U4IuT5 muYbH4ragX77qjZ0N3yMJlu9QqZnr8O4sq2UKTIObmxUNvdIIPxFe6QFL90bb8MAiZ6LEZ PhkZIu3Mrj0rmFAaKFig/Z1FEcSW+QLSjk6gW+01ryxq15BR24oPNUGHVPzyGGm0px9Jp3 c6MzQMG/R+7Y4/eZQAm/UotAe961+tvr/6w/lmsPipNH3FpdxMIzsQwehem1/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760185000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qv+eD81EU87Yi5FfjbjjnK5fT/4jfEFX/mRXV0npVa0=; b=EApPp4OWdffEcOgSX8MRoAP/v4hJBfm0M9TcICiBEnzsm1xGsHrC7QHNpjMqMku75CG8nC N6+uM9bzEhXvG4cK5JuefkGne/qL1FHY40jPh7Dql3ZVIKIe7sRaCuw57uCH0EL4RxJIql 503GdVTnBB8xFr9OKAfqKV0WaKNDeROipfeyhiKDKHWJeRoVHk3LyRaDPTPSPmZTzx7eov 5XrADkHe7xVryjw7M34KcRrX/Vf7BcH6Yh1M6yhPR4/hH0dstRQWM/1Acao8QVuS7NJBhW 4T4iACD4o+gJuIASN0EC3GRRh0QlvAAzsTeUGFQ80eBCHoE96D5LnRxxN7OYwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760185000; a=rsa-sha256; cv=none; b=bFoWOaeg3PcEn+Y08l8JQcSO1s7cUnko/1qPc7f9TyraMgP60ISc+fEknJ/9ilO6RCjaen tqlMBn8NNO/ZqeDoVu7KkJXFk43QsZJP50+oIrEXr5n3iiQq7H/OKkYQu6+Rf9e43SDrmY rtJUSsefDffe1TUpOr6pS8TIKEtqjQKVBfe0vQnudQGHoMa4ZCkBrbaey47kHcKqhmwhjI xpntpos4Dw701JLcJW0Spw/ZqJzDY58ViRZ+pSCaY5LSmAJTo9P964lcZ08ZklutjLK72X ywMS5Sq4LxBnujFVCqdaB7/ZPpAtW99gJHbk9hJqm0DYr8E0mNiH2cBOCNMlkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ckMzX0SC3zZtJ; Sat, 11 Oct 2025 12:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59BCGdwK059830; Sat, 11 Oct 2025 12:16:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59BCGdqa059827; Sat, 11 Oct 2025 12:16:39 GMT (envelope-from git) Date: Sat, 11 Oct 2025 12:16:39 GMT Message-Id: <202510111216.59BCGdqa059827@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: 942b60413c27 - main - devel/gnu-efi: Update to 3.0.18 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 942b60413c27b32478c66041ea62d774f509c330 Auto-Submitted: auto-generated The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=942b60413c27b32478c66041ea62d774f509c330 commit 942b60413c27b32478c66041ea62d774f509c330 Author: Bernhard Froehlich AuthorDate: 2025-10-11 12:15:03 +0000 Commit: Bernhard Froehlich CommitDate: 2025-10-11 12:16:08 +0000 devel/gnu-efi: Update to 3.0.18 PR: 289839 Approved by: maintainer timeout --- devel/gnu-efi/Makefile | 5 ++--- devel/gnu-efi/distinfo | 6 +++--- devel/gnu-efi/files/patch-Make.defaults | 32 ++++--------------------------- devel/gnu-efi/files/patch-Makefile | 6 +++--- devel/gnu-efi/files/patch-gnuefi-Makefile | 11 ----------- 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 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