From 9e9658a1253642e118458a9ff2d14d8c6d06bcd3 Mon Sep 17 00:00:00 2001
From: Guy Martin <gmsoft@gentoo.org>
Date: Fri, 23 Feb 2007 21:56:26 +0000
Subject: Fixed linking on hppa. The lib needs to be linked using gcc and not
 ld. (Portage version: 2.1.2-r9)

---
 media-libs/portaudio/ChangeLog                              | 9 +++++++--
 media-libs/portaudio/files/portaudio-18.1-r5-Makefile.linux | 3 +--
 media-libs/portaudio/files/portaudio-18.1-r6-Makefile       | 3 +--
 media-libs/portaudio/portaudio-18.1-r6.ebuild               | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'media-libs')

diff --git a/media-libs/portaudio/ChangeLog b/media-libs/portaudio/ChangeLog
index 8063530a9d20..28c5bb640af5 100644
--- a/media-libs/portaudio/ChangeLog
+++ b/media-libs/portaudio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/portaudio
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/ChangeLog,v 1.39 2006/12/03 23:24:25 jer Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/ChangeLog,v 1.40 2007/02/23 21:56:26 gmsoft Exp $
+
+  23 Feb 2007; Guy Martin <gmsoft@gentoo.org>
+  files/portaudio-18.1-r5-Makefile.linux, files/portaudio-18.1-r6-Makefile,
+  portaudio-18.1-r6.ebuild:
+  Fixed linking on hppa. The lib needs to be linked using gcc and not ld.
 
   03 Dec 2006; Jeroen Roovers <jer@gentoo.org> portaudio-18.1-r5.ebuild:
   Stable for HPPA (bug #154204).
diff --git a/media-libs/portaudio/files/portaudio-18.1-r5-Makefile.linux b/media-libs/portaudio/files/portaudio-18.1-r5-Makefile.linux
index 170e4a3fac12..ae06d0a3187b 100644
--- a/media-libs/portaudio/files/portaudio-18.1-r5-Makefile.linux
+++ b/media-libs/portaudio/files/portaudio-18.1-r5-Makefile.linux
@@ -23,7 +23,6 @@ LIBFILES:= ./pa_common/pa_lib.c ./pa_unix_oss/pa_unix_oss.c ./pa_unix_oss/pa_uni
 VERSION=18
 
 CC=gcc
-LD=ld
 AR=ar
 RANLIB=ranlib
 LN=ln
@@ -43,7 +42,7 @@ all: libportaudio.so libportaudio.a
 	$(CC) $(CFLAGS) -c -I./pa_common $? -o $@
 
 libportaudio.so.$(VERSION): $(LIBFILES:.c=.lo)
-	$(LD) -shared $(LIBS) -soname $@ -o $@ $?
+	$(CC) -shared $(LIBS) -Wl,-soname,$@ -o $@ $?
 
 libportaudio.so: libportaudio.so.$(VERSION)
 	$(LN) -s $? $@
diff --git a/media-libs/portaudio/files/portaudio-18.1-r6-Makefile b/media-libs/portaudio/files/portaudio-18.1-r6-Makefile
index 905d29f276c5..d98dacb33512 100644
--- a/media-libs/portaudio/files/portaudio-18.1-r6-Makefile
+++ b/media-libs/portaudio/files/portaudio-18.1-r6-Makefile
@@ -23,7 +23,6 @@ LIBFILES:= ./pa_common/pa_lib.c ./pa_unix_oss/pa_unix_oss.c ./pa_unix_oss/pa_uni
 VERSION=18
 
 CC=gcc
-LD=ld
 AR=ar
 RANLIB=ranlib
 LN=ln
@@ -43,7 +42,7 @@ all: libportaudio.so libportaudio.a
 	$(CC) $(CFLAGS) -c -I./pa_common $? -o $@
 
 libportaudio.so.$(VERSION): $(LIBFILES:.c=.lo)
-	$(LD) -shared $(LIBS) -soname $@ -o $@ $?
+	$(CC) -shared $(LIBS) -Wl,-soname,$@ -o $@ $?
 
 libportaudio.so: libportaudio.so.$(VERSION)
 	$(LN) -s $? $@
diff --git a/media-libs/portaudio/portaudio-18.1-r6.ebuild b/media-libs/portaudio/portaudio-18.1-r6.ebuild
index 7b2685a36089..f7cbddac272a 100644
--- a/media-libs/portaudio/portaudio-18.1-r6.ebuild
+++ b/media-libs/portaudio/portaudio-18.1-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-18.1-r6.ebuild,v 1.1 2006/11/30 19:39:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-18.1-r6.ebuild,v 1.2 2007/02/23 21:56:26 gmsoft Exp $
 
 inherit toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.portaudio.com/archives/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="18"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 RDEPEND=""
-- 
cgit v1.2.3-65-gdbad