diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2015-11-07 14:55:43 +0300 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2015-11-07 14:56:27 +0300 |
commit | 11274bcec2d735bbf1b3c9c79b2e1a6c6f347628 (patch) | |
tree | ed19f06d3fd5b24530a0edd19b4fa0b1d01fa288 /dev-libs | |
parent | gnome-extra/gnome-shell-extensions-topicons: Version bump (diff) | |
download | gentoo-11274bcec2d735bbf1b3c9c79b2e1a6c6f347628.tar.gz gentoo-11274bcec2d735bbf1b3c9c79b2e1a6c6f347628.tar.bz2 gentoo-11274bcec2d735bbf1b3c9c79b2e1a6c6f347628.zip |
dev-libs/STLport: fix accessing to tm struct during build
time_facets.cpp misses _USE_MISC check, which makes building failed
Fixed by adding a proper check. Drop old revision.
Suggested-by: uzu@tuta.io
Gentoo-Bug: 562926
Package-Manager: portage-2.2.24
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/STLport/STLport-5.2.1-r3.ebuild (renamed from dev-libs/STLport/STLport-5.2.1-r2.ebuild) | 5 | ||||
-rw-r--r-- | dev-libs/STLport/files/STLport-5.2.1-time-facets.patch | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/dev-libs/STLport/STLport-5.2.1-r2.ebuild b/dev-libs/STLport/STLport-5.2.1-r3.ebuild index a7ad58ae212b..0a03529b279d 100644 --- a/dev-libs/STLport/STLport-5.2.1-r2.ebuild +++ b/dev-libs/STLport/STLport-5.2.1-r3.ebuild @@ -18,7 +18,7 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="boost debug static static-libs threads" -DEPEND="boost? ( >=dev-libs/boost-1.35.0-r5 )" +DEPEND="boost? ( dev-libs/boost:= )" RDEPEND="${DEPEND}" DOCS=( README etc/ChangeLog doc/FAQ doc/README.utf8 ) @@ -45,6 +45,9 @@ src_prepare() { #define _LARGEFILE64_SOURCE EOF + # bug #562926 + epatch "${FILESDIR}/${P}-time-facets.patch" + epatch_user } diff --git a/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch b/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch new file mode 100644 index 000000000000..85a5a325bd5c --- /dev/null +++ b/dev-libs/STLport/files/STLport-5.2.1-time-facets.patch @@ -0,0 +1,12 @@ +diff -uNptr a/src/time_facets.cpp b/src/time_facets.cpp +--- a/src/time_facets.cpp 2008-12-10 10:56:51.000000000 +0100 ++++ b/src/time_facets.cpp 2015-10-11 12:07:55.841141984 +0100 +@@ -428,7 +428,7 @@ void _STLP_CALL __write_formatted_timeT( + break; + { + int diff; +-# if defined (__USE_BSD) || defined (__BEOS__) ++# if defined (__USE_MISC) || defined (__USE_BSD) || defined (__BEOS__) + diff = t->tm_gmtoff; + # else + diff = t->__tm_gmtoff; |