Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 May 2023 14:18:08 GMT
From:      Lorenzo Salvadore <salvadore@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 779e8ab2600f - main - lang/gcc12-devel: Fix enable init_array patch
Message-ID:  <202305201418.34KEI8Ii081953@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/ports/commit/?id=779e8ab2600fba5f045d80a1420f9f2278daad62

commit 779e8ab2600fba5f045d80a1420f9f2278daad62
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2023-05-20 00:38:33 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2023-05-20 14:17:36 +0000

    lang/gcc12-devel: Fix enable init_array patch
    
    Add an error line that was missing in case _FreeBSD_version < 1000010.
    
    Reported by:    gnikl@users.sourceforge.net
    Fixes:  8c2a479977f0 lang/gcc12-devel: Enable support for .init_array and .fini_array
---
 lang/gcc12-devel/Makefile                  | 1 +
 lang/gcc12-devel/files/patch-gcc_configure | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile
index c3ec6f9c9e3a..cfd49e19c9b6 100644
--- a/lang/gcc12-devel/Makefile
+++ b/lang/gcc12-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gcc
 PORTVERSION=	12.3.1.s20230512
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc12-devel/files/patch-gcc_configure b/lang/gcc12-devel/files/patch-gcc_configure
index d4e7e8d23e60..cc60593ba6f7 100644
--- a/lang/gcc12-devel/files/patch-gcc_configure
+++ b/lang/gcc12-devel/files/patch-gcc_configure
@@ -4,9 +4,9 @@ repository.
 
 There __FreeBSD_version is 1000009, so we start enabling the support
 from __FreeBSD_version == 1000010.
---- gcc/configure.orig	2023-05-04 17:36:54 UTC
+--- gcc/configure.orig	2023-05-11 22:33:34 UTC
 +++ gcc/configure
-@@ -24214,6 +24214,11 @@ EOF
+@@ -24214,6 +24214,13 @@ EOF
  #else
  # if defined __sun__ && defined __svr4__
     /* Solaris ld.so.1 supports .init_array/.fini_array since Solaris 8.  */
@@ -14,6 +14,8 @@ from __FreeBSD_version == 1000010.
 +#  include <sys/param.h>
 +#   if __FreeBSD_version >= 1000010
 +     /* FreeBSD supports .init_array/.fini_array since FreeBSD 10.  */
++#   else
++#    error The C library not known to support .init_array/.fini_array
 +#   endif
  # else
  #  error The C library not known to support .init_array/.fini_array



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