summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-04 00:36:15 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-04 00:36:15 +0000
commit77856b1a43bae89be7d18e687697e79495b1ea36 (patch)
tree564f14e8a52d035592618d2a2ecb53894e9a446b /media-libs
parentRemoving obsolete emboss packages (diff)
downloadgentoo-2-77856b1a43bae89be7d18e687697e79495b1ea36.tar.gz
gentoo-2-77856b1a43bae89be7d18e687697e79495b1ea36.tar.bz2
gentoo-2-77856b1a43bae89be7d18e687697e79495b1ea36.zip
Fix building on OS X #107428.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/urt/ChangeLog6
-rw-r--r--media-libs/urt/files/urt-3.1b-build-fixes.patch16
-rw-r--r--media-libs/urt/urt-3.1b-r1.ebuild6
3 files changed, 26 insertions, 2 deletions
diff --git a/media-libs/urt/ChangeLog b/media-libs/urt/ChangeLog
index 2e73a6e6e81b..8a0d334f2b12 100644
--- a/media-libs/urt/ChangeLog
+++ b/media-libs/urt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/urt
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.6 2005/10/02 02:14:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/ChangeLog,v 1.7 2005/10/04 00:36:15 vapier Exp $
+
+ 04 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/urt-3.1b-build-fixes.patch, urt-3.1b-r1.ebuild:
+ Fix building on OS X #107428.
02 Oct 2005; Jason Wever <weeve@gentoo.org> urt-3.1b-r1.ebuild:
Added ~sparc keyword wrt bug #107346.
diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
new file mode 100644
index 000000000000..462357200816
--- /dev/null
+++ b/media-libs/urt/files/urt-3.1b-build-fixes.patch
@@ -0,0 +1,16 @@
+some hosts are more anal about ar usage than others
+
+http://bugs.gentoo.org/107428
+
+--- lib/makefile.src
++++ lib/makefile.src
+@@ -181,8 +181,7 @@
+ # Rebuild the library from all the .o files.
+ buildlib: $(OBJS)
+ -rm -f $(LIBNAME)
+- ar rc $(LIBNAME)
+- ar q $(LIBNAME) $(OBJS)
++ ar rc $(LIBNAME) $(OBJS)
+ #ifndef NO_RANLIB
+ ranlib $(LIBNAME)
+ #endif
diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild
index 56c12ee7ab3c..b40598dc9fcd 100644
--- a/media-libs/urt/urt-3.1b-r1.ebuild
+++ b/media-libs/urt/urt-3.1b-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/urt-3.1b-r1.ebuild,v 1.3 2005/10/02 02:14:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/urt-3.1b-r1.ebuild,v 1.4 2005/10/04 00:36:15 vapier Exp $
inherit eutils
@@ -32,6 +32,10 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-rle-fixes.patch
epatch "${FILESDIR}"/${P}-compile-updates.patch
epatch "${FILESDIR}"/${P}-tempfile.patch
+ epatch "${FILESDIR}"/${P}-build-fixes.patch
+
+ # stupid OS X declares a stack_t type already #107428
+ sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c || die
sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
cp "${FILESDIR}"/gentoo-config config/gentoo