Date: Tue, 11 May 2021 18:47:38 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 47e21b774a21 - main - devel/gnulibiberty: bring up-to-date wrt devel/binutils Message-ID: <202105111847.14BIlc5g043672@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=47e21b774a21876aa848b7f69280715672ae8d6c commit 47e21b774a21876aa848b7f69280715672ae8d6c Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2021-05-10 14:11:57 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2021-05-11 18:45:57 +0000 devel/gnulibiberty: bring up-to-date wrt devel/binutils Match the versions of libiberty and binutils. These come from the same tarball upstream, so it's a bit odd to have mismatched versions to start with; in addition the libiberty version is years out-of-date. While here, drop a CONFLICTS line that doesn't make sense anymore. PR: 255794 Approved by: joerg@ (maintainer) --- devel/gnulibiberty/Makefile | 7 ++----- devel/gnulibiberty/distinfo | 5 +++-- devel/gnulibiberty/files/patch-Makefile.in | 19 ------------------ devel/gnulibiberty/files/patch-configure | 31 ------------------------------ devel/gnulibiberty/pkg-plist | 1 + 5 files changed, 6 insertions(+), 57 deletions(-) diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile index 66abacc83112..de19891610e9 100644 --- a/devel/gnulibiberty/Makefile +++ b/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 a/devel/gnulibiberty/distinfo b/devel/gnulibiberty/distinfo index 7cd363b480ba..26bb6cf5fda4 100644 --- a/devel/gnulibiberty/distinfo +++ b/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 a/devel/gnulibiberty/files/patch-Makefile.in b/devel/gnulibiberty/files/patch-Makefile.in deleted file mode 100644 index a001481ddffd..000000000000 --- a/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 a/devel/gnulibiberty/files/patch-configure b/devel/gnulibiberty/files/patch-configure deleted file mode 100644 index 2bfa84955ac6..000000000000 --- a/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 a/devel/gnulibiberty/pkg-plist b/devel/gnulibiberty/pkg-plist index 2176ec5fbf33..0366d53b4482 100644 --- a/devel/gnulibiberty/pkg-plist +++ b/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105111847.14BIlc5g043672>