Attachment 224852 Details for Bug 255794 – Patch ports tree (-p0)

[patch] Patch ports tree (-p0)

update-libiberty.patch (text/plain), 7.95 KB, created by Adriaan de Groot on 2021-05-11 14:21:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2021-05-11 14:21:21 UTC

Size: 7.95 KB

patch

obsolete

>diff --git devel/fnccheck/Makefile devel/fnccheck/Makefile
>index abce4c3ce95b..85f80e38596e 100644
>--- devel/fnccheck/Makefile
>+++ devel/fnccheck/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	fnccheck
> PORTVERSION=	3.2.0
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}
> DISTNAME=	FunctionCheck-${PORTVERSION}
>@@ -11,6 +11,7 @@ COMMENT=	Profiling library/utilities for C/C++ programs
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>+BUILD_DEPENDS=  gnulibiberty>=2.19.1:devel/gnulibiberty
> LIB_DEPENDS=	libbfd.so:devel/libbfd
> 
> USES=		autoreconf libtool
>diff --git devel/fnccheck/files/patch-src_fcdump_demangle.h devel/fnccheck/files/patch-src_fcdump_demangle.h
>new file mode 100644
>index 000000000000..7c2e56b9ba92
>--- /dev/null
>+++ devel/fnccheck/files/patch-src_fcdump_demangle.h
>@@ -0,0 +1,13 @@
>+--- src/fcdump/demangle.h.orig	2021-05-10 22:03:39 UTC
>++++ src/fcdump/demangle.h
>+@@ -16,8 +16,9 @@
>+    along with this program; if not, write to the Free Software
>+    Foundation, Inc., 59 Temple Place - Suite 330,
>+    Boston, MA 02111-1307, USA.  */
>++#include <libiberty/demangle.h>
>+ 
>+-#if !defined (DEMANGLE_H)
>++#if 0
>+ #define DEMANGLE_H
>+ 
>+ #include <ansidecl.h>
>diff --git devel/fnccheck/files/patch-src_fcdump_fc__dump.c devel/fnccheck/files/patch-src_fcdump_fc__dump.c
>new file mode 100644
>index 000000000000..c7635681b4c4
>--- /dev/null
>+++ devel/fnccheck/files/patch-src_fcdump_fc__dump.c
>@@ -0,0 +1,11 @@
>+--- src/fcdump/fc_dump.c.orig	2021-05-10 22:05:35 UTC
>++++ src/fcdump/fc_dump.c
>+@@ -597,7 +597,7 @@ int main(int argc, char *argv[])
>+                 if (strcmp(argv[i], "-demangle-gnu") == 0)
>+             {/* demangle names */
>+                 demangle = 1;
>+-                style = DMGL_GNU;
>++                style = DMGL_GNU_V3;
>+             }
>+             else
>+                 if (strcmp(argv[i], "-demangle-java") == 0)
>diff --git devel/fnccheck/files/patch-src_fcdump_fc__names.c devel/fnccheck/files/patch-src_fcdump_fc__names.c
>new file mode 100644
>index 000000000000..2aa44f508eeb
>--- /dev/null
>+++ devel/fnccheck/files/patch-src_fcdump_fc__names.c
>@@ -0,0 +1,11 @@
>+--- src/fcdump/fc_names.c.orig	2021-05-10 22:04:48 UTC
>++++ src/fcdump/fc_names.c
>+@@ -99,7 +99,7 @@ int fc_open_bfd_file(char *name, bfd **core_bfd, int *
>+     switch (bfd_get_arch(*core_bfd))
>+     {
>+         case bfd_arch_vax:
>+-        case bfd_arch_tahoe:
>++        /* case bfd_arch_tahoe: */
>+             *core_offset_to_code = 2;
>+             break;
>+         case bfd_arch_alpha:
>diff --git devel/gnulibiberty/Makefile devel/gnulibiberty/Makefile
>index 66abacc83112..de19891610e9 100644
>--- devel/gnulibiberty/Makefile
>+++ devel/gnulibiberty/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Joerg Wunsch <joerg@FreeBSD.org>
> 
> PORTNAME=	gnulibiberty
>-PORTVERSION=	2.19.1
>-PORTREVISION=	2
>+PORTVERSION=	2.33.1
> CATEGORIES=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
> DISTNAME=	binutils-${PORTVERSION}
>@@ -12,11 +11,9 @@ COMMENT=	Miscellaneous GNU functions
> 
> WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}/libiberty
> 
>-USES=		gmake tar:bzip2
>+USES=		gmake tar:xz
> 
> CONFIGURE_ARGS=	--enable-install-libiberty
> GNU_CONFIGURE=	yes
> 
>-CONFLICTS=	freelibiberty-[0-9]*
>-
> .include <bsd.port.mk>
>diff --git devel/gnulibiberty/distinfo devel/gnulibiberty/distinfo
>index 7cd363b480ba..26bb6cf5fda4 100644
>--- devel/gnulibiberty/distinfo
>+++ devel/gnulibiberty/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (binutils-2.19.1.tar.bz2) = 3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
>-SIZE (binutils-2.19.1.tar.bz2) = 16245771
>+TIMESTAMP = 1575361927
>+SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
>+SIZE (binutils-2.33.1.tar.xz) = 21490848
>diff --git devel/gnulibiberty/files/patch-Makefile.in devel/gnulibiberty/files/patch-Makefile.in
>deleted file mode 100644
>index a001481ddffd..000000000000
>--- devel/gnulibiberty/files/patch-Makefile.in
>+++ /dev/null
>@@ -1,19 +0,0 @@
>---- Makefile.in.orig	Thu Jul 24 15:51:49 2008
>-+++ Makefile.in	Mon Apr  6 09:05:19 2009
>-@@ -348,11 +348,15 @@
>- INSTALL_DEST = @INSTALL_DEST@
>- install: install_to_$(INSTALL_DEST) install-subdir
>- 
>-+## FreeBSD port removed this: otherwise, FreeBSD 6.x would end up installing
>-+## in ${prefix}/lib/elf rather than ${prefix}/lib
>-+##
>- # This is tricky.  Even though CC in the Makefile contains
>- # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
>- # default multilib, so we have to take LIBCFLAGS into account as well,
>- # since it will be passed the multilib flags.
>--MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
>-+##MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
>-+MULTIOSDIR = .
>- install_to_libdir: all
>- 	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
>- 	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
>diff --git devel/gnulibiberty/files/patch-configure devel/gnulibiberty/files/patch-configure
>deleted file mode 100644
>index 2bfa84955ac6..000000000000
>--- devel/gnulibiberty/files/patch-configure
>+++ /dev/null
>@@ -1,31 +0,0 @@
>---- configure.orig	Fri Apr  7 02:01:25 2006
>-+++ configure	Tue Oct 10 13:00:57 2006
>-@@ -5679,6 +5679,14 @@
>- 
>-   fi
>- 
>-+
>-+else
>-+
>-+   # Not a target library, so we set things up to run the test suite.
>-+   CHECK=really-check
>-+
>-+fi
>-+
>-   # We may wish to install the target headers somewhere.
>-   # Check whether --enable-install-libiberty or --disable-install-libiberty was given.
>- if test "${enable_install_libiberty+set}" = set; then
>-@@ -5701,13 +5709,6 @@
>-       ;;
>-   esac
>- 
>--
>--else
>--
>--   # Not a target library, so we set things up to run the test suite.
>--   CHECK=really-check
>--
>--fi
>- 
>- 
>- 
>diff --git devel/gnulibiberty/pkg-plist devel/gnulibiberty/pkg-plist
>index 2176ec5fbf33..0366d53b4482 100644
>--- devel/gnulibiberty/pkg-plist
>+++ devel/gnulibiberty/pkg-plist
>@@ -10,4 +10,5 @@ include/libiberty/partition.h
> include/libiberty/safe-ctype.h
> include/libiberty/sort.h
> include/libiberty/splay-tree.h
>+include/libiberty/timeval-utils.h
> lib/libiberty.a
>diff --git devel/libbfd/Makefile devel/libbfd/Makefile
>index df52d5335b66..48c17353e05e 100644
>--- devel/libbfd/Makefile
>+++ devel/libbfd/Makefile
>@@ -1,8 +1,7 @@
> # Created by: Joerg Wunsch <joerg@FreeBSD.org>
> 
> PORTNAME=	libbfd
>-PORTVERSION=	2.19.1
>-PORTREVISION=	3
>+PORTVERSION=	2.33.1
> CATEGORIES=	devel
> MASTER_SITES=	SOURCEWARE/binutils/releases
> DISTNAME=	binutils-${PORTVERSION}
>@@ -20,7 +19,7 @@ CONFLICTS=	mingw-binutils-[0-9]* binutils-[0-9]*
> 
> WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}/bfd
> 
>-USES=		libtool tar:bzip2
>+USES=		libtool tar:xz
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-install-libbfd \
> 		--disable-nls \
>diff --git devel/libbfd/distinfo devel/libbfd/distinfo
>index 7cd363b480ba..26bb6cf5fda4 100644
>--- devel/libbfd/distinfo
>+++ devel/libbfd/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (binutils-2.19.1.tar.bz2) = 3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
>-SIZE (binutils-2.19.1.tar.bz2) = 16245771
>+TIMESTAMP = 1575361927
>+SHA256 (binutils-2.33.1.tar.xz) = ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf
>+SIZE (binutils-2.33.1.tar.xz) = 21490848
>diff --git devel/libbfd/files/patch-configure devel/libbfd/files/patch-configure
>deleted file mode 100644
>index 09c4304b45dc..000000000000
>--- devel/libbfd/files/patch-configure
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- configure.orig
>-+++ configure
>-@@ -19503,7 +19503,7 @@ case "${host}" in
>-     WIN32LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
>-   fi
>-   ;;
>--*-*-linux*)
>-+*)
>-   # We borrow WIN32LIBADD so that the shared libbfd won't depend on
>-   # libiberty.a.
>-   x=`sed -n -e 's/^[ 	]*PICFLAG[ 	]*=[ 	]*//p' < ../libiberty/Makefile | sed -n '$p'`
>diff --git devel/libbfd/pkg-plist devel/libbfd/pkg-plist
>index ebf52dbe6d35..ed8ba61a5ad3 100644
>--- devel/libbfd/pkg-plist
>+++ devel/libbfd/pkg-plist
>@@ -1,7 +1,10 @@
> include/ansidecl.h
> include/bfd.h
> include/bfdlink.h
>+include/bfd_stdint.h
>+include/diagnostics.h
>+include/plugin-api.h
> include/symcat.h
>-lib/libbfd-2.19.1.so
>+lib/libbfd-2.33.1.so
> lib/libbfd.a
> lib/libbfd.so

Actions: View | Diff

Attachments on bug 255794: 224852