Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-www/gnash/files: gnash-0.8.3-boost-dynamic-link.patch
Date: Mon, 01 Sep 2008 21:11:18
Message-Id: E1KaGg6-000399-Bk@stork.gentoo.org
1 loki_val 08/09/01 21:11:14
2
3 Modified: gnash-0.8.3-boost-dynamic-link.patch
4 Log:
5 Update dynamic link patch to always link dynamic, bug 230287
6 (Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)
7
8 Revision Changes Path
9 1.2 net-www/gnash/files/gnash-0.8.3-boost-dynamic-link.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/gnash/files/gnash-0.8.3-boost-dynamic-link.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/gnash/files/gnash-0.8.3-boost-dynamic-link.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/gnash/files/gnash-0.8.3-boost-dynamic-link.patch?r1=1.1&r2=1.2
14
15 Index: gnash-0.8.3-boost-dynamic-link.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-www/gnash/files/gnash-0.8.3-boost-dynamic-link.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- gnash-0.8.3-boost-dynamic-link.patch 28 Jun 2008 11:42:56 -0000 1.1
22 +++ gnash-0.8.3-boost-dynamic-link.patch 1 Sep 2008 21:11:13 -0000 1.2
23 @@ -10,10 +10,10 @@
24 fi
25 for j in ${boost_libs}; do
26 - dirs="`ls -dr $i/libboost_${j}*.${shlibext} $i/libboost_${j}*.a 2>/dev/null`"
27 -+ dirs="`ls -dr $i/libboost_${j}*.${shlibext} 2>/dev/null`"
28 ++ dirs="`ls -dr $i/libboost_${j}*.so 2>/dev/null`"
29 if test -n "${dirs}"; then
30 - libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
31 -+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::"`"
32 ++ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.so::"`"
33 if test x$dirname = x; then
34 dirname="`echo ${dirs} | sed -e 's:/libboost.*$::'`"
35 if test x"${dirname}" != "x/usr/lib"; then
36 @@ -22,10 +22,10 @@
37 done
38 for j in ${extra_boost_libs}; do
39 - dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} ${dirname}/libboost_${j}*.a 2>/dev/null`"
40 -+ dirs="`ls -dr ${dirname}/libboost_${j}*.${shlibext} 2>/dev/null`"
41 ++ dirs="`ls -dr ${dirname}/libboost_${j}*.so 2>/dev/null`"
42 if test -n "${dirs}"; then
43 - libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::" -e "s:\.a::"`"
44 -+ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.${shlibext}::"`"
45 ++ libname="`echo ${dirs} | sed -e 's:^.*/lib::' -e "s:\.so::"`"
46 ac_cv_path_boost_extra_lib="${ac_cv_path_boost_extra_lib} -l${libname}"
47 else
48 extra_missing_libs="${extra_missing_libs} $j"