aboutsummaryrefslogtreecommitdiff
path: root/devel/gnulibiberty
diff options
context:
space:
mode:
authorJoerg Wunsch <joerg@FreeBSD.org>2009-04-06 07:11:23 +0000
committerJoerg Wunsch <joerg@FreeBSD.org>2009-04-06 07:11:23 +0000
commit1d867846292cd43140d8077df3f1be11bb8e5c55 (patch)
treeace3daa2744eaf3513d263dbf6b15094762a0f4e /devel/gnulibiberty
parent128b3ce717be8adadbd502acae7c9d2bc083d915 (diff)
downloadports-1d867846292cd43140d8077df3f1be11bb8e5c55.tar.gz
ports-1d867846292cd43140d8077df3f1be11bb8e5c55.zip
Notes
Diffstat (limited to 'devel/gnulibiberty')
-rw-r--r--devel/gnulibiberty/Makefile2
-rw-r--r--devel/gnulibiberty/files/patch-Makefile.in19
2 files changed, 20 insertions, 1 deletions
diff --git a/devel/gnulibiberty/Makefile b/devel/gnulibiberty/Makefile
index c82051afe21c..01703ea4ad92 100644
--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnulibiberty
PORTVERSION= 2.19.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= binutils/releases
diff --git a/devel/gnulibiberty/files/patch-Makefile.in b/devel/gnulibiberty/files/patch-Makefile.in
new file mode 100644
index 000000000000..a001481ddffd
--- /dev/null
+++ b/devel/gnulibiberty/files/patch-Makefile.in
@@ -0,0 +1,19 @@
+--- 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