Skip to content
Snippets Groups Projects
Commit 47e21b77 authored by Adriaan de Groot's avatar Adriaan de Groot
Browse files

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)
parent 28e7a933
No related branches found
No related tags found
No related merge requests found
# 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>
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
--- 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
--- 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
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment