Attachment 240863 Details for Bug 270222 – restore behaviour priro to 2f26d37a5937

[patch] restore behaviour priro to 2f26d37a5937

binutils.patch (text/plain), 3.73 KB, created by Cy Schubert on 2023-03-15 02:09:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2023-03-15 02:09:35 UTC

Size: 3.73 KB

patch

obsolete

>From ec5edf683d6c3195c96631c2b0468045e1d45219 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Sun, 12 Mar 2023 08:08:35 -0700
>Subject: [PATCH 1/2] devel/binutils: Sort plist
>
>---
> devel/binutils/pkg-plist | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist
>index 100532991306..5a4e30936592 100644
>--- a/devel/binutils/pkg-plist
>+++ b/devel/binutils/pkg-plist
>@@ -37,8 +37,8 @@ man/man1/addr2line.1.gz
> man/man1/ar.1.gz
> man/man1/as.1.gz
> man/man1/c++filt.1.gz
>-man/man1/gprof.1.gz
> man/man1/elfedit.1.gz
>+man/man1/gprof.1.gz
> man/man1/ld.1.gz
> man/man1/nm.1.gz
> man/man1/objcopy.1.gz
>-- 
>2.40.0
>
>
>From ca083f419f6ee5579598242021ae90870e869ce5 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Sun, 12 Mar 2023 11:10:55 -0700
>Subject: [PATCH 2/2] devel/binutils: Enable shared
>
>The submittor's reason for this change is that shared libraries makes
>dependencies easier to track. However, this is not the primary reason
>to add shared library support. Shared libraries are more secure because
>should a depending package, such as binutils, require a security update
>any depending packages will immediately reap the benefit of the newly
>secured package.
>
>This change only affects the native flavor because when 2f26d37a5937
>(SVN r517642) changed the port from slave ports of binutils to FLAVORS,
>it mistakenly removed shared libraries from the native package. Prior to
>this 2f26d37a5937 only non-native packages were built producing only
>static libraries. This revision restores the behabviour of prior to
>2f26d37a5937.
>
>PR:		270146
>Reported by:	yuri
>---
> devel/binutils/Makefile  | 17 ++++++++++++++---
> devel/binutils/pkg-plist | 15 ++++++++++++++-
> 2 files changed, 28 insertions(+), 4 deletions(-)
>
>diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
>index 8b8f9a3c200d..a468d736263d 100644
>--- a/devel/binutils/Makefile
>+++ b/devel/binutils/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	binutils
> DISTVERSION=	2.40
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH?=	1
> CATEGORIES?=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
>@@ -82,10 +82,18 @@ BUTARGET=	x86_64-unknown-${OPSYS:tl}${OSREL}
> USES+=		iconv
> .endif
> 
>-CONFIGURE_ARGS+=	--disable-shared \
>-			--target=${BUTARGET}
>+CONFIGURE_ARGS+=	--target=${BUTARGET}
> .endif
> 
>+.if ${FLAVOR} == native
>+CONFIGURE_ARGS+=	--enable-shared
>+PLIST_SUB+=		SHARED=''
>+.else
>+CONFIGURE_ARGS+=	--disable-shared
>+PLIST_SUB+=		SHARED='@comment'
>+.endif
>+
>+
> .if ${FLAVOR} == native
> BUREMOVE=	coffdump \
> 		dlltool \
>@@ -146,6 +154,9 @@ post-patch:
> 
> post-install:
> .if ${FLAVOR} == native
>+	@${STRIP_CMD} \
>+		${STAGEDIR}${PREFIX}/lib/lib*.so* \
>+		${STAGEDIR}${PREFIX}/lib/bfd-plugins/libdep.so
> 	${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/
> 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d | \
> 		${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
>diff --git a/devel/binutils/pkg-plist b/devel/binutils/pkg-plist
>index 5a4e30936592..7aff2860c5ec 100644
>--- a/devel/binutils/pkg-plist
>+++ b/devel/binutils/pkg-plist
>@@ -27,12 +27,25 @@ include/dis-asm.h
> include/sframe-api.h
> include/sframe.h
> include/symcat.h
>-lib/bfd-plugins/libdep.so
>+%%SHARED%%lib/bfd-plugins/libdep.so
>+%%SHARED%%lib/libbfd-2.40.so
> lib/libbfd.a
>+%%SHARED%%lib/libbfd.so
> lib/libctf-nobfd.a
>+%%SHARED%%lib/libctf-nobfd.so
>+%%SHARED%%lib/libctf-nobfd.so.0
>+%%SHARED%%lib/libctf-nobfd.so.0.0.0
> lib/libctf.a
>+%%SHARED%%lib/libctf.so
>+%%SHARED%%lib/libctf.so.0
>+%%SHARED%%lib/libctf.so.0.0.0
>+%%SHARED%%lib/libopcodes-2.40.so
> lib/libopcodes.a
>+%%SHARED%%lib/libopcodes.so
> lib/libsframe.a
>+%%SHARED%%lib/libsframe.so
>+%%SHARED%%lib/libsframe.so.0
>+%%SHARED%%lib/libsframe.so.0.0.0
> man/man1/addr2line.1.gz
> man/man1/ar.1.gz
> man/man1/as.1.gz
>-- 
>2.40.0
>

Actions: View | Diff

Attachments on bug 270222: 240852 | 240854 | 240863 | 240864 | 240873