summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2014-01-20 12:36:11 +0000
committerSergey Popov <pinkbyte@gentoo.org>2014-01-20 12:36:11 +0000
commit34640c3dae27da2831053d98d29cd2f92451e469 (patch)
tree5d57bdabf5edc08db1022ce3819e69d7e54237b0 /net-libs/pjsip
parentRevision bump: EAPI 5, fix underlinking wrt bug #481764. Thanks to Sander Swe... (diff)
downloadhistorical-34640c3dae27da2831053d98d29cd2f92451e469.tar.gz
historical-34640c3dae27da2831053d98d29cd2f92451e469.tar.bz2
historical-34640c3dae27da2831053d98d29cd2f92451e469.zip
Fix install failure on non-multilib systems, bug #497744. Thanks to Luke-Jr <luke-jr+gentoobugs AT utopios.org> for discovering this issue
Package-Manager: portage-2.2.8/cvs/Linux x86_64 Manifest-Sign-Key: 0x1F357D42
Diffstat (limited to 'net-libs/pjsip')
-rw-r--r--net-libs/pjsip/ChangeLog8
-rw-r--r--net-libs/pjsip/Manifest18
-rw-r--r--net-libs/pjsip/pjsip-2.1-r2.ebuild11
3 files changed, 22 insertions, 15 deletions
diff --git a/net-libs/pjsip/ChangeLog b/net-libs/pjsip/ChangeLog
index 4015aa471dfb..c864ee435501 100644
--- a/net-libs/pjsip/ChangeLog
+++ b/net-libs/pjsip/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/pjsip
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.15 2013/12/31 10:15:54 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/ChangeLog,v 1.16 2014/01/20 12:36:10 pinkbyte Exp $
+
+ 20 Jan 2014; Sergey Popov <pinkbyte@gentoo.org> pjsip-2.1-r2.ebuild:
+ Fix install failure on non-multilib systems, bug #497744. Thanks to Luke-Jr
+ <luke-jr+gentoobugs AT utopios.org> for discovering this issue
*pjsip-2.1-r2 (31 Dec 2013)
diff --git a/net-libs/pjsip/Manifest b/net-libs/pjsip/Manifest
index 91f4b09b51dd..3d31b1ed481a 100644
--- a/net-libs/pjsip/Manifest
+++ b/net-libs/pjsip/Manifest
@@ -7,18 +7,18 @@ DIST pjproject-1.14.tar.bz2 3861992 SHA256 d5e394c08572231e68866c86697cef9d86ecc
DIST pjproject-2.1.tar.bz2 4111835 SHA256 ac86d2401e1cb4a4f0207e4fd58921f869d0b5ee65a26aa438039a107ba415a5 SHA512 a31c33fb45b074bb43ecf8f579d140cf2d7fe2d508edad5643a9124e7e85dc50e1ecc860e2e52ca42e82c92121b08e7e3691b5dd99db844b21749e03afbc2f94 WHIRLPOOL 5363b206186d08e9446ca4c0cf8bbe668816944cfc06c7e0f30cdbeccfae0771813dbc02aa2151fa185a508e3a1b86a22a1e0126f13b965282ce036f31e9fd08
EBUILD pjsip-1.14.ebuild 2753 SHA256 40ce41f4a03aab3620dc4fed86475513fab4a5f9b40f90e9ba9d214fa5024bfb SHA512 8f8318986bdfd87fd6fde8f21c514a0eb7473b6d3b07fb836afd9512396601eceee37747ee40d39a9399629c983b971a604438ed5e87d7955b2afb3801a7da09 WHIRLPOOL 64066da9433df887b2554e430e815eb2fa89172ff76c22663cbe1ee490c88dbe45bb6a284d2936c4e4b7ea4fadc165a75aaa7f8db109dec38801e773db534e72
EBUILD pjsip-2.1-r1.ebuild 1990 SHA256 c4fe4d01ea468a59ead9c9a86ad968e501fd967147db903f1f781e52c4c8114e SHA512 7c8e473c64a62deb70f7a83ddbdeb280802dc411aa0180c2f595a3e22c2b439759a56185cd8e7114a18cb1dde91f51b02de176b9c3d6b5e621713743a2f28728 WHIRLPOOL a94a7a6b9655404150a2aae7989612cd5aeb3dc2bc6f6be6fae2d612e5cecb53c0972583ee35c6325cbcc29e7b9eb008bf1af4aca23e9fa6e0b144e19e198a40
-EBUILD pjsip-2.1-r2.ebuild 2047 SHA256 d4571efce1baf0b6fb34e6b72d899d45a77c05fabef311be542a1778da1bb230 SHA512 8b67a299983639d3531284dab793c940e2b7c175f74d34a36e13d6516ad468ab0549ee28a5b2d8f49bcdd1ae6f457c720f2f7cc3e909a656a63a9c9ff33c90b2 WHIRLPOOL 22df1560d2d86c45ba7ee069b897c67fec9f0f5c4aa708aa865fc12cc270b16bd680150b3cda4d9a3f46d5b555133e4e52d213ebe38be5bb89093b9eeb72eaf7
+EBUILD pjsip-2.1-r2.ebuild 2146 SHA256 b0761d78dd8abcc74b3d8722273f54f366a5e6ad86a3eb5778e0470317dabd31 SHA512 ded35088c5ace5e6fa39dfd0c16003fa4a98405d238f3c926b142296caeb95f6bfb962835b08635688145228e536b1b26978dd7ee5e78f401bcee8ce3084025b WHIRLPOOL 4a033708960863c01960492a991c80f3c1d9c3b820357ce8e8ca0d009081bcebb2a507b044b6c77cae3ec1a9db96a5669134677e066bb84edf1cc555a0072a9b
EBUILD pjsip-2.1.ebuild 1954 SHA256 1d01f240117de30662451812f6d9892972b1e50e23a4a1cbb53ed3ea7dbfe84f SHA512 8139fcac23beb604e0ef424dc846005b8bc22c10707ce53dda181444a70f3a7ae5899af43a9bf32153d6430cb853a64a499d8746eefe1935f4a5737179372dac WHIRLPOOL 8dc1ad929ac713619f619287aa59ca2e1d4f93490e6b29d342b91424d2358be9daafd4d1fd77fd49139f182408c13246389f180c3e8f05d31208b2b5c3c23637
-MISC ChangeLog 2252 SHA256 e48cc27e237a2ed51f692ab2517516f3220748aa7a63b848a2082d2eae8936f1 SHA512 b6f8699690bcbf0208cd4b6877b57f561e02599fa588dcbce9d40b91947d219744e97e215bed4e504e03cba9b06baba9047317cabb9e9f1e535dd7d8e984da71 WHIRLPOOL 9476a9ee24ff3bce3f1f19ec1e78008416526f01c1fa9d9b6d3880b7397602dc5c7493cd20532586f0c8f653a5ff939b1f9046e055de9d70119ff2669390d65d
+MISC ChangeLog 2467 SHA256 e34a110e7262e3f36b922cb0313d62108340f853ad279ff807625630b1d00c9d SHA512 39aa9defeb818e26b0f24743793aacb583f47c5b03451aed2fe5df1ac24b5f14770dd808cf647890acf97803f58544344ae5c9ee267076210ad85563993cbc12 WHIRLPOOL c43d24da199f520f9c2621533181318a39f1683695a8e5043c867d40977feba750bdc14298040389c6c4a1e32f278711f2120c5c50964d28a29b77cdeb8e0ca7
MISC metadata.xml 902 SHA256 7d33c28a8c43039e371c9a519da699a4d7a07d701b8b4d09fb4f260b1da8e4ae SHA512 e9d07891cb7595bc13a15bacd52ac874f2e4f5fc4e983dea9c9b00c61fdc6641b1a24748baeac294e5508fe500f5840c13d6b96b6e67ac1ed1663589273d7282 WHIRLPOOL afeb81ec264b366bd5b9c0a1c88ab80a8aa4cde63ad0c42482bcb30ac4346b4c4a7d6fe217cba7efd1cd5576a4f511129dd42a529b92d596d2ae023ebf0320a1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJSwplbAAoJECo/aRed9267CvEH/3hk6hN/dDii20jL0aHSrejC
-c4aN0NoU/ezO9syKiGZSDslbn8g85pR14ZyCGck6XI/Z2dHvsItjB9Pul9tOHkxu
-XVLb5UuwynK/mmzO3fOZS6wrMuBK2RkuNU2SzD/AL2yevFpVaWOn4SQfJBChAtOA
-W+SsDX3fUo8GG+cT1JGRCCBR6Yef50Mukbw+8exChC8K5sUjnGYqak3B+UWbLNHU
-WL98tLFUc3WcLEB+htNiKpwUhDb1Yg+Swa6mZXTxTtGl2Jrh+Y0fz1g0xHPcjs1i
-DJDlqgVhdVOgQIhiTnNJV2+5XNs84syxsuSJww3wAFayFbWYU+4WCko4Vt3Yy44=
-=cVgb
+iQEcBAEBCAAGBQJS3Rg3AAoJECo/aRed9267VnEH/3qSva1ydmnStJAGSoKfHYqQ
+ZkE5Qhl30xzoRctVbTKN5yN/k2NFpYPuDcNY4lWvyLAE7xA0oFsIcYK7fHmHfgFa
+1EIU+B1bUYMI4aldiEjEh1FuY4wAgrGG6aBK8YM2ZzW2WknJs0yUY1RQ9HBDsnfg
+4NnhGVw1bsl4IZQopXUGNTfvrA5v6QCwTqbjkh7H4ckt1xwDPxrL/4oJ3UzOf+Q0
+GbtjnVCC5ec7XxfW7/moFKtbyWs+YWwWHKzIGEYfydsnKQbtkfLtg9l2608epo8B
+5RXvFZcAHGm+vo46gohb4NfsVkNAPmhILSVdgaDJlXva4Uxd0jrHYcxjL1d0/pU=
+=MJex
-----END PGP SIGNATURE-----
diff --git a/net-libs/pjsip/pjsip-2.1-r2.ebuild b/net-libs/pjsip/pjsip-2.1-r2.ebuild
index cc367ca8877f..337fa3a6118c 100644
--- a/net-libs/pjsip/pjsip-2.1-r2.ebuild
+++ b/net-libs/pjsip/pjsip-2.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r2.ebuild,v 1.1 2013/12/31 10:15:54 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-2.1-r2.ebuild,v 1.2 2014/01/20 12:36:10 pinkbyte Exp $
EAPI="5"
-inherit eutils
+inherit eutils multilib
DESCRIPTION="Multimedia communication libraries written in C language for building VoIP applications"
HOMEPAGE="http://www.pjsip.org/"
@@ -37,7 +37,10 @@ src_prepare() {
src_configure() {
# Disable through portage available codecs
- econf --disable-gsm-codec \
+ # libdir should be defined explicitly, bug #497744
+ econf \
+ --libdir="/usr/$(get_libdir)" \
+ --disable-gsm-codec \
--disable-speex-codec \
--disable-ilbc-codec \
--disable-speex-aec \