From f016d1f173c117280760875ab15e674d57b7d094 Mon Sep 17 00:00:00 2001 From: Guy Martin Date: Fri, 23 Feb 2007 21:56:26 +0000 Subject: [PATCH] Fixed linking on hppa. The lib needs to be linked using gcc and not ld. Package-Manager: portage-2.1.2-r9 --- media-libs/portaudio/ChangeLog | 9 ++++-- media-libs/portaudio/Manifest | 32 +++++++++---------- .../files/portaudio-18.1-r5-Makefile.linux | 3 +- .../files/portaudio-18.1-r6-Makefile | 3 +- media-libs/portaudio/portaudio-18.1-r6.ebuild | 6 ++-- 5 files changed, 28 insertions(+), 25 deletions(-) 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 + 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 portaudio-18.1-r5.ebuild: Stable for HPPA (bug #154204). diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest index 6e919b797b25..c7bd18d8f0cb 100644 --- a/media-libs/portaudio/Manifest +++ b/media-libs/portaudio/Manifest @@ -6,14 +6,14 @@ AUX portaudio-18.1-Makefile.macos 1584 RMD160 2ffbe7333a42c5518fdbbc5aaf3efc9b08 MD5 669994e10d27eea57fd352f0336268fd files/portaudio-18.1-Makefile.macos 1584 RMD160 2ffbe7333a42c5518fdbbc5aaf3efc9b08b6de7b files/portaudio-18.1-Makefile.macos 1584 SHA256 981c94e1dcf32b078b346eed1ed97b16b970aac8f08626dbeffb735a52f26f82 files/portaudio-18.1-Makefile.macos 1584 -AUX portaudio-18.1-r5-Makefile.linux 1593 RMD160 58f02f8f148ac59c66d2b14812e163ce2100d83c SHA1 30553237671ccab10c91c44b482c9ad2d6fb4675 SHA256 6bfa6ca03b4000308b0618f4501dfcaf436a1d9d10931c061361b12925fdb729 -MD5 038062b0685e7fcba0e807cd078e6518 files/portaudio-18.1-r5-Makefile.linux 1593 -RMD160 58f02f8f148ac59c66d2b14812e163ce2100d83c files/portaudio-18.1-r5-Makefile.linux 1593 -SHA256 6bfa6ca03b4000308b0618f4501dfcaf436a1d9d10931c061361b12925fdb729 files/portaudio-18.1-r5-Makefile.linux 1593 -AUX portaudio-18.1-r6-Makefile 1645 RMD160 02f05b04d6f3b5d453d2ad393bd0b921c65678ce SHA1 536ccc42793c62249fba75ab4100dd5c7507eb70 SHA256 5341a005ffeb53054d12851d4eff74243fe24ac8157c594eeecb2add475efa5b -MD5 7b32d6f27fb8d3f8b2b65c8eb946a0b3 files/portaudio-18.1-r6-Makefile 1645 -RMD160 02f05b04d6f3b5d453d2ad393bd0b921c65678ce files/portaudio-18.1-r6-Makefile 1645 -SHA256 5341a005ffeb53054d12851d4eff74243fe24ac8157c594eeecb2add475efa5b files/portaudio-18.1-r6-Makefile 1645 +AUX portaudio-18.1-r5-Makefile.linux 1591 RMD160 2662f59aee90e7bebb48b13da482a8579118aef2 SHA1 a815302d2372c6198a9a09812a2f6204ba3c6b97 SHA256 3d342b7c93b5e30fa12d960d8e465ac0635668d802f1afd1f175506929529097 +MD5 f1691641fbfbdbb578b74d660e82d042 files/portaudio-18.1-r5-Makefile.linux 1591 +RMD160 2662f59aee90e7bebb48b13da482a8579118aef2 files/portaudio-18.1-r5-Makefile.linux 1591 +SHA256 3d342b7c93b5e30fa12d960d8e465ac0635668d802f1afd1f175506929529097 files/portaudio-18.1-r5-Makefile.linux 1591 +AUX portaudio-18.1-r6-Makefile 1643 RMD160 1381535bd96c596712439bacb00b15fbf24ef954 SHA1 f2b563115fbabd25d9168b16c18b05732b65d892 SHA256 112bca3712ab89435dea41eb4867aec8252ad4704433522bf14816ab01b0872f +MD5 b7aab0f85af152c6233d3b08b6a695c9 files/portaudio-18.1-r6-Makefile 1643 +RMD160 1381535bd96c596712439bacb00b15fbf24ef954 files/portaudio-18.1-r6-Makefile 1643 +SHA256 112bca3712ab89435dea41eb4867aec8252ad4704433522bf14816ab01b0872f files/portaudio-18.1-r6-Makefile 1643 AUX portaudio-18.1-use-fpic.patch 3420 RMD160 a808a293c85820d14348ef6fa2a7f6cc32660d4f SHA1 2eb4c04eef263bdef20b7fd91ac8241f786a837b SHA256 4011b1202bafc32b4c077c115074c89ec444897a2be65fb684ec50391898e13b MD5 8461b4a89f5c56d005f6818a8bf410f3 files/portaudio-18.1-use-fpic.patch 3420 RMD160 a808a293c85820d14348ef6fa2a7f6cc32660d4f files/portaudio-18.1-use-fpic.patch 3420 @@ -35,18 +35,18 @@ EBUILD portaudio-18.1-r5.ebuild 1046 RMD160 5201d8e76b0e33b739b039c79279666d5e8a MD5 1ff8f2d52cc075b73ea4f6f427551f84 portaudio-18.1-r5.ebuild 1046 RMD160 5201d8e76b0e33b739b039c79279666d5e8a13a4 portaudio-18.1-r5.ebuild 1046 SHA256 0273114e838843e0861604ef98e62880f5987a3a1375c4fb64eeacb36fb45c18 portaudio-18.1-r5.ebuild 1046 -EBUILD portaudio-18.1-r6.ebuild 1262 RMD160 757dea904e39c67d6ce78dad6e666afd8953fa59 SHA1 310717f2571b65204a943f9985a3fecf82c95cc1 SHA256 f9fe009ea21d91720a9393ec9932caf8fb9a2089e04d9b40c0ba64e6f32ca83e -MD5 65257d12c85862904f0361bd5d364923 portaudio-18.1-r6.ebuild 1262 -RMD160 757dea904e39c67d6ce78dad6e666afd8953fa59 portaudio-18.1-r6.ebuild 1262 -SHA256 f9fe009ea21d91720a9393ec9932caf8fb9a2089e04d9b40c0ba64e6f32ca83e portaudio-18.1-r6.ebuild 1262 +EBUILD portaudio-18.1-r6.ebuild 1259 RMD160 8d9920109101c9d448d3cd339b245321fbb2f2fa SHA1 a14c8b65e371426c874be84ef11bfa9712a83c6a SHA256 f151598e9cf529e1ef9d7e00724e6c92bec8813bbc733a0e4427e47a81288c59 +MD5 a32246c3a7bed2eaf7f69d31c61e72c1 portaudio-18.1-r6.ebuild 1259 +RMD160 8d9920109101c9d448d3cd339b245321fbb2f2fa portaudio-18.1-r6.ebuild 1259 +SHA256 f151598e9cf529e1ef9d7e00724e6c92bec8813bbc733a0e4427e47a81288c59 portaudio-18.1-r6.ebuild 1259 EBUILD portaudio-18.1.ebuild 995 RMD160 af0edc7d988953321519eefd4fb7610a326ab8aa SHA1 2e52b5828392ed43db8362f0cc89eb5023f07e32 SHA256 0279febaa02eb0c390c3ee207239ab650ccef9d361397f0620c17719039efd71 MD5 e7355796f0c381e5e8128913f94e4b8a portaudio-18.1.ebuild 995 RMD160 af0edc7d988953321519eefd4fb7610a326ab8aa portaudio-18.1.ebuild 995 SHA256 0279febaa02eb0c390c3ee207239ab650ccef9d361397f0620c17719039efd71 portaudio-18.1.ebuild 995 -MISC ChangeLog 4975 RMD160 7fb057a9333af40b5dc59c0e9ae72fafd92b966e SHA1 79a9a6f7e3ffdefdee4ea5ed9be5bde5f88258b5 SHA256 159dd2a730597322774c766ffc10f055808b295a605d5a7951dd22663701c763 -MD5 1f7786b33f4057abe919489064cdd233 ChangeLog 4975 -RMD160 7fb057a9333af40b5dc59c0e9ae72fafd92b966e ChangeLog 4975 -SHA256 159dd2a730597322774c766ffc10f055808b295a605d5a7951dd22663701c763 ChangeLog 4975 +MISC ChangeLog 5203 RMD160 eea62899732a4c19ccea512e6829dc6c0d8ee201 SHA1 49a2bdd6ab1b8388164201580b42c59e8cff5fd7 SHA256 2a4e07c200317276bd0c97fbd0c28bd449e56db62d1dcd52cd3bc644674bd2ed +MD5 f9031e8a1ab0e9bb5a7dc26764d85938 ChangeLog 5203 +RMD160 eea62899732a4c19ccea512e6829dc6c0d8ee201 ChangeLog 5203 +SHA256 2a4e07c200317276bd0c97fbd0c28bd449e56db62d1dcd52cd3bc644674bd2ed ChangeLog 5203 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 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="" -- 2.26.2