diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2006-10-06 11:59:07 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2006-10-06 11:59:07 +0000 |
| commit | c0863eebe3ec292e609c92fcd65a483c7e05007d (patch) | |
| tree | 6f60111a6f2e9014a2e7f1ed5682bf4c8a08bd1f /net-misc | |
| parent | Adding hs-plugins release candidate. (diff) | |
| download | gentoo-2-c0863eebe3ec292e609c92fcd65a483c7e05007d.tar.gz gentoo-2-c0863eebe3ec292e609c92fcd65a483c7e05007d.tar.bz2 gentoo-2-c0863eebe3ec292e609c92fcd65a483c7e05007d.zip | |
multilib-strict fixes
(Portage version: 2.1.2_pre2-r3)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/asterisk/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/asterisk/asterisk-1.2.12.1.ebuild | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog index d585f6ee6cf1..36e9549f9fd2 100644 --- a/net-misc/asterisk/ChangeLog +++ b/net-misc/asterisk/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for net-misc/asterisk # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.125 2006/10/03 18:54:40 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.126 2006/10/06 11:59:06 blubb Exp $ 03 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> asterisk-1.2.12.1.ebuild: @@ -14,6 +14,9 @@ -asterisk-1.2.9_p1.ebuild, +asterisk-1.2.12.1.ebuild: version bump from overlay + 06 Oct 2006; Simon Stelling <blubb@gentoo.org> asterisk-1.2.11.ebuild: + fix wrt multilib-strict; bug 138242 + 14 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> asterisk-1.2.11.ebuild: Stable on sparc wrt security #144941 diff --git a/net-misc/asterisk/asterisk-1.2.12.1.ebuild b/net-misc/asterisk/asterisk-1.2.12.1.ebuild index 0e1220081382..dbd424bb1800 100644 --- a/net-misc/asterisk/asterisk-1.2.12.1.ebuild +++ b/net-misc/asterisk/asterisk-1.2.12.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.12.1.ebuild,v 1.2 2006/10/03 18:54:40 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.12.1.ebuild,v 1.3 2006/10/06 11:59:07 blubb Exp $ -inherit eutils +inherit eutils multilib IUSE="alsa bri curl debug doc gtk genericjb h323 hardened lowmem mmx mysql \ nosamples odbc osp postgres pri speex sqlite ssl ukcid zaptel" @@ -109,7 +109,7 @@ scan_modules() { local modules_list="" local n - for x in $(ls -1 ${ROOT}usr/lib/asterisk/modules/*.so); do + for x in $(ls -1 ${ROOT}usr/$(get_libdir)/asterisk/modules/*.so); do echo -en "Scanning.... $(basename ${x}) \r" # skip blacklisted modules @@ -314,12 +314,12 @@ src_compile() { src_install() { # install asterisk - make DESTDIR=${D} install || die "Make install failed" - make DESTDIR=${D} samples || die "Failed to create sample files" + make DESTDIR=${D} ASTLIBDIR="\$(INSTALL_PREFIX)/usr/$(get_libdir)/asterisk" install || die "Make install failed" + make DESTDIR=${D} ASTLIBDIR="\$(INSTALL_PREFIX)/usr/$(get_libdir)/asterisk" samples || die "Failed to create sample files" # remove bristuff capi use bri && \ - rm -f ${D}usr/lib/asterisk/modules/{app,chan}_capi*.so 2>/dev/null + rm -f ${D}usr/$(get_libdir)/asterisk/modules/{app,chan}_capi*.so 2>/dev/null # remove installed sample files if nosamples flag is set if use nosamples; then |