diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2014-02-12 10:31:15 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2014-02-12 10:31:15 +0000 |
| commit | 42d2d4ad9f36cb964d5febc6eb9fb0b59f8d4dba (patch) | |
| tree | af7b9a58cc64793899300f1522b3104d2a54045a /dev-db/drizzle | |
| parent | Bumping to 2.1 (diff) | |
| download | gentoo-2-42d2d4ad9f36cb964d5febc6eb9fb0b59f8d4dba.tar.gz gentoo-2-42d2d4ad9f36cb964d5febc6eb9fb0b59f8d4dba.tar.bz2 gentoo-2-42d2d4ad9f36cb964d5febc6eb9fb0b59f8d4dba.zip | |
Fix detection of boost_thread, wrt bug #490216, add epatch_user
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Diffstat (limited to 'dev-db/drizzle')
| -rw-r--r-- | dev-db/drizzle/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/drizzle/drizzle-7.2.4.ebuild | 13 | ||||
| -rw-r--r-- | dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch | 18 |
3 files changed, 32 insertions, 7 deletions
diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog index 8be08d3fbd6e..68b057e28600 100644 --- a/dev-db/drizzle/ChangeLog +++ b/dev-db/drizzle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/drizzle -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.35 2013/03/17 17:39:35 hwoarang Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.36 2014/02/12 10:31:14 pinkbyte Exp $ + + 12 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> drizzle-7.2.4.ebuild, + +files/drizzle-7.2.4-fix-boost_thread-detection.patch: + Fix detection of boost_thread, wrt bug #490216, add epatch_user 17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml: Add proxy-maintainers to metadata.xml diff --git a/dev-db/drizzle/drizzle-7.2.4.ebuild b/dev-db/drizzle/drizzle-7.2.4.ebuild index 6f3fb9a1e176..4f5ade4665c3 100644 --- a/dev-db/drizzle/drizzle-7.2.4.ebuild +++ b/dev-db/drizzle/drizzle-7.2.4.ebuild @@ -1,6 +1,6 @@ -# 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/dev-db/drizzle/drizzle-7.2.4.ebuild,v 1.3 2013/03/04 06:49:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2.4.ebuild,v 1.4 2014/02/12 10:31:14 pinkbyte Exp $ EAPI=5 @@ -52,12 +52,15 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-7.2.3-libtool.patch - epatch "${FILESDIR}"/${PN}-7.2.3+automake-1.12.patch - epatch "${FILESDIR}"/${PN}-7.2.4+boost-1.50.patch + epatch \ + "${FILESDIR}/${PN}-7.2.3-libtool.patch" \ + "${FILESDIR}/${PN}-7.2.3+automake-1.12.patch" \ + "${FILESDIR}/${PN}-7.2.4+boost-1.50.patch" \ + "${FILESDIR}/${P}-fix-boost_thread-detection.patch" python_convert_shebangs -r 2 . + epatch_user eautoreconf } diff --git a/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch b/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch new file mode 100644 index 000000000000..e33e6e59afd1 --- /dev/null +++ b/dev-db/drizzle/files/drizzle-7.2.4-fix-boost_thread-detection.patch @@ -0,0 +1,18 @@ +--- m4/pandora_have_libboost_thread.m4.orig 2014-02-12 13:52:43.580001598 +0400 ++++ m4/pandora_have_libboost_thread.m4 2014-02-12 13:53:24.288002974 +0400 +@@ -17,13 +17,13 @@ + CXXFLAGS="${PTHREAD_CFLAGS} ${CXXFLAGS}" + + AC_LANG_PUSH(C++) +- AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,,[ ++ AC_LIB_HAVE_LINKFLAGS(boost_thread-mt,boost_system-mt,[ + #include <boost/thread.hpp> + ],[ + boost::thread id; + ]) + AS_IF([test "x${ac_cv_libboost_thread_mt}" = "xno"],[ +- AC_LIB_HAVE_LINKFLAGS(boost_thread,,[ ++ AC_LIB_HAVE_LINKFLAGS(boost_thread,boost_system,[ + #include <boost/thread.hpp> + ],[ + boost::thread id; |