git: 1d972bfb40eb - main - devel/linux-c7-devtools: Bundle libgfortran and ignore libquadmath requires

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Mon, 02 Jun 2025 10:46:34 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1d972bfb40eb5ceea7979daa8faef43224d05d6c

commit 1d972bfb40eb5ceea7979daa8faef43224d05d6c
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-04-18 13:16:00 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-06-02 10:44:35 +0000

    devel/linux-c7-devtools: Bundle libgfortran and ignore libquadmath requires
    
    - libgfortran depends on libs installed by this port, so there is a little
    sense to keep it in a separate port
    - libquadmath is placed into a non-ldconfig directory and we don't seem to
      have all bits in place to make linux-ldconfig work
---
 devel/linux-c7-devtools/Makefile          | 5 +++--
 devel/linux-c7-devtools/distinfo          | 8 +++++++-
 devel/linux-c7-devtools/pkg-plist.aarch64 | 2 ++
 devel/linux-c7-devtools/pkg-plist.amd64   | 4 ++++
 devel/linux-c7-devtools/pkg-plist.i386    | 2 ++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/devel/linux-c7-devtools/Makefile b/devel/linux-c7-devtools/Makefile
index 93739092def4..6b3cefbd5213 100644
--- a/devel/linux-c7-devtools/Makefile
+++ b/devel/linux-c7-devtools/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	devtools
 PORTVERSION=	${LINUX_DIST_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 
 MAINTAINER=	emulation@FreeBSD.org
@@ -11,7 +11,7 @@ WWW=		https://gcc.gnu.org/
 
 USES=		linux:c7
 USE_LDCONFIG=	yes
-USE_LINUX=	libgfortran
+NO_SHLIB_REQUIRES_GLOB=	libquadmath.so.0:Linux*
 USE_LINUX_RPM=	yes
 
 BUVERSION=	2.27-44.base.el7
@@ -25,6 +25,7 @@ BIN_DISTNAMES=	binutils-${BUVERSION} \
 LIB_DISTNAMES=	binutils-devel-${BUVERSION} \
 		glibc-devel-2.17-326.el7_9.3 \
 		glibc-static-2.17-326.el7_9.3 \
+		libgfortran-4.8.5-44.el7 \
 		libgomp-4.8.5-44.el7 \
 		libmpc-1.0.1-3.el7
 DISTFILES_aarch64=${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_aarch64}:aarch64/} \
diff --git a/devel/linux-c7-devtools/distinfo b/devel/linux-c7-devtools/distinfo
index 922297613039..2d2b645fd740 100644
--- a/devel/linux-c7-devtools/distinfo
+++ b/devel/linux-c7-devtools/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1727865529
+TIMESTAMP = 1744978763
 SHA256 (centos/binutils-2.27-44.base.el7.aarch64.rpm) = 1cdc630593b80df6421c05262155a8153f879fb4009c95c6e07eb1dc32838848
 SIZE (centos/binutils-2.27-44.base.el7.aarch64.rpm) = 5950056
 SHA256 (centos/binutils-2.27-44.base.el7.i686.rpm) = cc70ede4e2a8409107f7aceaea594444002c65a784d5b2b07fee26c1b7a93f19
@@ -59,6 +59,12 @@ SHA256 (centos/kernel-headers-3.10.0-1160.62.1.el7.centos.plus.i686.rpm) = efd2d
 SIZE (centos/kernel-headers-3.10.0-1160.62.1.el7.centos.plus.i686.rpm) = 9498048
 SHA256 (centos/kernel-headers-4.18.0-348.20.1.el7.aarch64.rpm) = f22a6a3ede39bb2f3ee9523559c1d7cef563d21ef190a8aaf0aae0428824ce6c
 SIZE (centos/kernel-headers-4.18.0-348.20.1.el7.aarch64.rpm) = 8641048
+SHA256 (centos/libgfortran-4.8.5-44.el7.aarch64.rpm) = 1f6ef1a5e52cdea9e638ba0bde907f2c4512e4b6db588ecb46c0c797f5181651
+SIZE (centos/libgfortran-4.8.5-44.el7.aarch64.rpm) = 258224
+SHA256 (centos/libgfortran-4.8.5-44.el7.i686.rpm) = 535c5c31dcbeaf6a5acd6a3e12aae888940ce2c493face3d8ff592b0ebec6736
+SIZE (centos/libgfortran-4.8.5-44.el7.i686.rpm) = 294592
+SHA256 (centos/libgfortran-4.8.5-44.el7.x86_64.rpm) = fcb704ac8a8c78ac003a7cc630918237ed74b1e02832ab79f127da2a551d96ae
+SIZE (centos/libgfortran-4.8.5-44.el7.x86_64.rpm) = 308088
 SHA256 (centos/libgomp-4.8.5-44.el7.aarch64.rpm) = f628a33b88c38e4aa30b617c53a6ce5c95d4a501746e14e1b286df296946f8f0
 SIZE (centos/libgomp-4.8.5-44.el7.aarch64.rpm) = 158992
 SHA256 (centos/libgomp-4.8.5-44.el7.i686.rpm) = 972b17660cda0172abbdc0d0f164441e20636829239d52bb392a31a530c2fb43
diff --git a/devel/linux-c7-devtools/pkg-plist.aarch64 b/devel/linux-c7-devtools/pkg-plist.aarch64
index efd0ad30103c..093d9880e5ae 100644
--- a/devel/linux-c7-devtools/pkg-plist.aarch64
+++ b/devel/linux-c7-devtools/pkg-plist.aarch64
@@ -2082,6 +2082,8 @@ usr/lib64/libcrypt.so
 usr/lib64/libdl.a
 usr/lib64/libdl.so
 usr/lib64/libg.a
+usr/lib64/libgfortran.so.3
+usr/lib64/libgfortran.so.3.0.0
 usr/lib64/libgomp.so.1
 usr/lib64/libgomp.so.1.0.0
 usr/lib64/libiberty.a
diff --git a/devel/linux-c7-devtools/pkg-plist.amd64 b/devel/linux-c7-devtools/pkg-plist.amd64
index e64c0ea8c262..b716b964697c 100644
--- a/devel/linux-c7-devtools/pkg-plist.amd64
+++ b/devel/linux-c7-devtools/pkg-plist.amd64
@@ -2077,6 +2077,8 @@ usr/lib/libcrypt.so
 usr/lib/libdl.a
 usr/lib/libdl.so
 usr/lib/libg.a
+usr/lib/libgfortran.so.3
+usr/lib/libgfortran.so.3.0.0
 usr/lib/libgomp.so.1
 usr/lib/libgomp.so.1.0.0
 usr/lib/libiberty.a
@@ -2133,6 +2135,8 @@ usr/lib64/libcrypt.so
 usr/lib64/libdl.a
 usr/lib64/libdl.so
 usr/lib64/libg.a
+usr/lib64/libgfortran.so.3
+usr/lib64/libgfortran.so.3.0.0
 usr/lib64/libgomp.so.1
 usr/lib64/libgomp.so.1.0.0
 usr/lib64/libiberty.a
diff --git a/devel/linux-c7-devtools/pkg-plist.i386 b/devel/linux-c7-devtools/pkg-plist.i386
index adc8fb48556f..0307e866d59a 100644
--- a/devel/linux-c7-devtools/pkg-plist.i386
+++ b/devel/linux-c7-devtools/pkg-plist.i386
@@ -2018,6 +2018,8 @@ usr/lib/libcrypt.so
 usr/lib/libdl.a
 usr/lib/libdl.so
 usr/lib/libg.a
+usr/lib/libgfortran.so.3
+usr/lib/libgfortran.so.3.0.0
 usr/lib/libgomp.so.1
 usr/lib/libgomp.so.1.0.0
 usr/lib/libiberty.a