From c1f6db64626ac6bc5833641491c0e02b9bfa075a Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 7 Oct 2004 02:06:57 +0000 Subject: [PATCH] Added correct multilib support. --- media-libs/openal/ChangeLog | 6 +++++- media-libs/openal/Manifest | 15 +++++++++++++-- .../openal/files/openal-20040817-destdir.patch | 14 ++++++++++++++ media-libs/openal/openal-20040817.ebuild | 8 +++++--- 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 media-libs/openal/files/openal-20040817-destdir.patch diff --git a/media-libs/openal/ChangeLog b/media-libs/openal/ChangeLog index 2407d7c77086..14fdc210ed4a 100644 --- a/media-libs/openal/ChangeLog +++ b/media-libs/openal/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/openal # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.32 2004/09/15 19:21:49 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/ChangeLog,v 1.33 2004/10/07 02:06:57 eradicator Exp $ + + 06 Oct 2004; Jeremy Huddleston + +files/openal-20040817-destdir.patch: + Added correct multilib support. 15 Sep 2004; Jeremy Huddleston openal-20040817.ebuild: diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index aafb0fc2e4d9..a907f632cf9a 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1,11 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 ec6dcddda50a0138e1f50eb0d1299798 metadata.xml 254 MD5 e8fc1ce9c63f468205396334b2a16c48 openal-20020127.ebuild 2075 -MD5 e84908f5c6619fb236585e97463c715c openal-20040817.ebuild 1869 +MD5 437658c090b319b374070d23bf8c53f1 openal-20040817.ebuild 1886 MD5 a33a07e0d0e18acb564733a170473d12 openal-20040303.ebuild 1869 -MD5 2067a214713e122ca683fc8c75c15df0 ChangeLog 4131 +MD5 fa831a2ab4da395d04649c5cd9c3d4fc ChangeLog 4263 MD5 35b8b81a8d71be18d124e5bca01622fb files/digest-openal-20020127 68 MD5 7a79e920a2131ac669da96c4cf5e66e9 files/digest-openal-20040817 69 MD5 4751d1095a6b93726e35d53ad66d9839 files/digest-openal-20040303 69 MD5 526498c24d3601f624e025aaa7c46de2 files/openal-20040817-alsa_capture.diff 12172 MD5 3ffc8792ba0039005def0a8fd9b572b1 files/openal-20040303-alsa_capture.diff 12171 MD5 8072d11c3e5e44c43407bed8c67b4031 files/openalrc 221 +MD5 7d1289ab83aa79eaa7e09d5e4ccacc45 files/openal-20040817-destdir.patch 498 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBZKTLArHZZzCEUG0RAgi9AJ42ajJ1SXYIxb2Fj3muLzMQ+qoaLgCeLFvT +4zd5bNoPN2VskCvwKnex4mE= +=S1xQ +-----END PGP SIGNATURE----- diff --git a/media-libs/openal/files/openal-20040817-destdir.patch b/media-libs/openal/files/openal-20040817-destdir.patch new file mode 100644 index 000000000000..172b7f209aee --- /dev/null +++ b/media-libs/openal/files/openal-20040817-destdir.patch @@ -0,0 +1,14 @@ +diff -Naur openal-20040817.orig/linux/Makefile.in openal-20040817/linux/Makefile.in +--- openal-20040817.orig/linux/Makefile.in 2002-09-05 15:54:36.000000000 -0700 ++++ openal-20040817/linux/Makefile.in 2004-10-06 19:02:21.785622393 -0700 +@@ -1,8 +1,7 @@ + INSTALL=@INSTALL@ + LN_S=@LN_S@ +-DESTDIR=@prefix@/ +-DESTINC=$(DESTDIR)include +-DESTLIB=$(DESTDIR)lib ++DESTINC=$(DESTDIR)@prefix@/@includedir@ ++DESTLIB=$(DESTDIR)@libdir@ + MAKE=@MAKE@ + MAJOR_VERSION=@MAJOR_VERSION@ + MINOR_VERSION=@MINOR_VERSION@ diff --git a/media-libs/openal/openal-20040817.ebuild b/media-libs/openal/openal-20040817.ebuild index 417e941885b6..adbdc0c9a56a 100644 --- a/media-libs/openal/openal-20040817.ebuild +++ b/media-libs/openal/openal-20040817.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20040817.ebuild,v 1.2 2004/09/15 19:21:49 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-20040817.ebuild,v 1.3 2004/10/07 02:06:57 eradicator Exp $ inherit eutils @@ -34,8 +34,10 @@ src_compile() { cd ${S}/linux use alsa && epatch ${FILESDIR}/${P}-alsa_capture.diff + epatch ${FILESDIR}/${P}-destdir.patch + WANT_AUTOCONF=2.5 ./autogen.sh || die - ./configure --prefix=/usr ${myconf} --enable-paranoid-locks \ + econf ${myconf} --enable-paranoid-locks \ --enable-capture --enable-optimize || die emake all || die } @@ -43,7 +45,7 @@ src_compile() { src_install() { cd ${S}/linux - make install DESTDIR=${D}/usr/|| die + make install DESTDIR="${D}" || die dodoc CREDITS ChangeLog INSTALL NOTES PLATFORM TODO dodoc ${FILESDIR}/openalrc -- 2.26.2