Archives
Archives
| From: | "Julian Ospald (hasufell)" <hasufell@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in games-strategy/glob2/files: glob2-0.9.4.4-underlinking.patch |
| Date: | Sun, 27 Oct 2013 16:49:41 |
| Message-Id: | 20131027164934.2814B20047@flycatcher.gentoo.org |
| 1 | hasufell 13/10/27 16:49:34 |
| 2 | |
| 3 | Added: glob2-0.9.4.4-underlinking.patch |
| 4 | Log: |
| 5 | fix underlinking and other stuff wrt #489312 |
| 6 | |
| 7 | (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: glob2-0.9.4.4-underlinking.patch |
| 16 | =================================================================== |
| 17 | diff -burN glob2-0.9.4.4.orig/SConstruct glob2-0.9.4.4/SConstruct |
| 18 | --- glob2-0.9.4.4.orig/SConstruct 2009-08-30 21:23:30.000000000 +0200 |
| 19 | +++ glob2-0.9.4.4/SConstruct 2013-10-24 21:03:46.755492770 +0200 |
| 20 | @@ -110,6 +110,16 @@ |
| 21 | print "Could not find libz or zlib1.dll" |
| 22 | missing.append("zlib") |
| 23 | |
| 24 | + boost_system = '' |
| 25 | + if conf.CheckLib("boost_system"): |
| 26 | + boost_system="boost_system" |
| 27 | + elif conf.CheckLib("boost_system-mt"): |
| 28 | + boost_system="boost_system-mt" |
| 29 | + else: |
| 30 | + print "Could not find libboost_system or libboost_system-mt" |
| 31 | + missing.append("libboost_system") |
| 32 | + env.Append(LIBS=[boost_system]) |
| 33 | + |
| 34 | boost_thread = '' |
| 35 | if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): |
| 36 | boost_thread="boost_thread" |