diff options
Diffstat (limited to 'dev-db/drizzle')
| -rw-r--r-- | dev-db/drizzle/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/drizzle/Manifest | 15 | ||||
| -rw-r--r-- | dev-db/drizzle/drizzle-2010.03.1412.ebuild | 46 | ||||
| -rw-r--r-- | dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch | 39 |
4 files changed, 82 insertions, 26 deletions
diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog index 97cb1d881bdf..648614083c80 100644 --- a/dev-db/drizzle/ChangeLog +++ b/dev-db/drizzle/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/drizzle # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.8 2010/04/01 15:01:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.9 2010/04/17 18:41:00 robbat2 Exp $ + + 17 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> + drizzle-2010.03.1412.ebuild, +files/drizzle-2010.03.1412-ggdb3-fix.patch: + Tweak the ebuild per suggestions by Monty Taylor of upstream, during the + Drizzle Developer day following MySQL UC 2010. Patch to disable -ggdb3 + being forced as well. *drizzle-2010.03.1412 (01 Apr 2010) diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest index 574cf7d494b2..c84172a1d899 100644 --- a/dev-db/drizzle/Manifest +++ b/dev-db/drizzle/Manifest @@ -1,19 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX drizzle-2009.12.1240-nolint.patch 366 RMD160 5edac5d0f35b6a7830ba4c5d4cc9fa78f30c29bc SHA1 29f2257773552dabc40424ac068ca4ef32425d01 SHA256 612ffed94aebcce0aeef56a4fabfe35a5bb01f6c85a4c00757bef59f0cd75312 +AUX drizzle-2010.03.1412-ggdb3-fix.patch 1298 RMD160 29e17c18ae3476ea532b78c0e6a957fca1c8e547 SHA1 495dc9d1008e9cd57aa02351c46ffd223796eb9a SHA256 97b63b130277a824e820a7e423086e9f265287edfc19ecdd4a39c06acc7a21ab AUX drizzle.conf.d 17 RMD160 04ac72be16bab0e6a590a19d2d663baa6741e743 SHA1 0337f18c03bbfbf1203a6391f8d7076a4d36a155 SHA256 5739bf0120eb4ef9dfed0b5307332d10c728ab9d204411d37fec85393e6db630 AUX drizzle.init.d 4247 RMD160 6208fe8ad2a1fc3480f835d101799412b73ef208 SHA1 b0a288670de9a37f54f75b773aadbd56d737af64 SHA256 9b33960f1a203265f13bdd4c1a444cfa9c96e06529b45432d3e8e820a6e4d266 DIST drizzle-2010.03.1347.tar.gz 7365259 RMD160 beaac701311da2c47a0fb78f0388b4fd00e41513 SHA1 9c81b4b9418979f6d29343e149cf048d0e93bec7 SHA256 30c274be33d05dca50c3211155b4e1dd267ac52828d3d9a2a0f2820dbac37586 DIST drizzle-2010.03.1412.tar.gz 7299720 RMD160 2275465ee5cdd3d35463f7f516a744b1612092dd SHA1 85cbda12aa034409c08ffee11ed6870029a0676b SHA256 cd19f4c318a8dcb527e6c1c86b97dae8e07cc2fee85f66dade7b6bead9920dc7 EBUILD drizzle-2010.03.1347.ebuild 4549 RMD160 da52788744b9be7c8ecc7e800aa38888450eba20 SHA1 e58b13de9d87f3cc3f5b6afe24f1d171456f0317 SHA256 ea5984c18ef4e23413dea24e30f0617e8342a61a8b08f3f011e2c6b0f4f10d4f -EBUILD drizzle-2010.03.1412.ebuild 3064 RMD160 7fb0b360fa8d582ac4c77bf686bfd956f2cec237 SHA1 fcc78a21db584144955736cb5b56c461a833c83c SHA256 f973eadedaf4fdec6fe4584bc88ba3398803b2bd6aa5de0cdef447f8daaed2a0 -MISC ChangeLog 2164 RMD160 5178d658af6b68d4287138c7a35b9158db0e5ba0 SHA1 dc8f47e4ef4b3c5aa2a9e841cfeb3cad7f3d4254 SHA256 a88edd061021a0f69271abbecc51f7820bb47de1c113644bbc1c4e76e2db0f47 +EBUILD drizzle-2010.03.1412.ebuild 3739 RMD160 dfe58cc7829d5e258422b8658f6a15b3ed91bce1 SHA1 254b35bd809ebc07e65cffe493bb7531a701959e SHA256 40c09f13fc0115630a425ec213fbe59a05a5f2b26c6bc3b200846bb30a735fc9 +MISC ChangeLog 2464 RMD160 90b5fa86d061702b5ab06ef8a06c6419a427ab56 SHA1 ce117eeb710ba1384ed49e34ad4e1c34f796107d SHA256 e13a6b72304d2286f7f4676d3aae7c1cb43146bb9f860a0bdc6ededcf836266f MISC metadata.xml 2823 RMD160 4d8ec16d5d512d4325305133578c2f0396200485 SHA1 2612ed473de2c4c0d6e912bdb1cc4303429a8b12 SHA256 37f8608359cbaea4b9a3f4ba0f5e71fa83f8236303584d5ca6458f5ed7fc8857 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAku0tWgACgkQAiZjviIA2XiFSwCdGDhrnvVFo/sPokKvJW3xtrap -fyUAn22C4QEGScVHB1ZBWv6B3zOByqGZ -=7mLU ------END PGP SIGNATURE----- diff --git a/dev-db/drizzle/drizzle-2010.03.1412.ebuild b/dev-db/drizzle/drizzle-2010.03.1412.ebuild index 570cf588f050..b10a6c507c3e 100644 --- a/dev-db/drizzle/drizzle-2010.03.1412.ebuild +++ b/dev-db/drizzle/drizzle-2010.03.1412.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.03.1412.ebuild,v 1.1 2010/04/01 15:01:51 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-2010.03.1412.ebuild,v 1.2 2010/04/17 18:41:00 robbat2 Exp $ EAPI=2 @@ -11,39 +11,41 @@ HOMEPAGE="http://drizzle.org" SRC_URI="http://launchpad.net/drizzle/cherry/2010-03-29/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="debug tcmalloc doc memcache curl pam gearman +md5" # upstream bug #499911 RESTRICT="memcache? ( test ) !curl? ( test )" +# for libdrizzle version, check m4/pandora*, PANDORA_LIBDRIZZLE_RECENT RDEPEND="tcmalloc? ( dev-util/google-perftools ) - dev-db/libdrizzle + >=dev-db/libdrizzle-0.8 sys-libs/readline sys-apps/util-linux dev-libs/libpcre - dev-libs/libevent - dev-libs/protobuf - gearman? ( sys-cluster/gearmand ) + >=dev-libs/libevent-1.4 + >=dev-libs/protobuf-2.1.0 + gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) - memcache? ( dev-libs/libmemcached ) - md5? ( dev-libs/libgcrypt )" + memcache? ( >=dev-libs/libmemcached-0.39 ) + md5? ( >=dev-libs/libgcrypt-1.4.2 ) + >=dev-libs/boost-1.32" DEPEND="${RDEPEND} dev-util/gperf - doc? ( app-doc/doxygen )" + doc? ( app-doc/doxygen ) + >=dev-util/boost-build-1.32" pkg_setup() { - elog "This is a work-in-progress ebuild, some features will require" - elog "manual configuration and others aren't fleshed out just yet." - elog "Use it at your risk." - enewuser drizzle -1 -1 /dev/null nogroup } src_prepare() { + epatch "${FILESDIR}/${PN}-2010.03.1412-ggdb3-fix.patch" + # disable in release after 1412 epatch "${FILESDIR}/${PN}-2009.12.1240-nolint.patch" + AT_M4DIR="m4" eautoreconf elibtoolize } @@ -54,19 +56,35 @@ src_configure() { if use debug; then append-flags -DDEBUG fi + + # while I applaud upstreams goal of 0 compiler warnings + # the 1412 release didn't achieve it. + append-flags -Wno-error + # disable-all gets rid of automagic dep econf \ + --disable-all \ --disable-static \ --disable-dependency-tracking \ --disable-mtmalloc \ + --with-debug=$(use debug && echo yes || echo no) \ $(use_enable tcmalloc) \ $(use_enable memcache libmemcached) \ $(use_enable gearman libgearman) \ $(use_with curl auth-http-plugin) \ $(use_with pam auth-pam-plugin) \ $(use_with md5 md5-plugin) \ + $(use_with gearman gearman_udf-plugin) \ + $(use_with gearman logging_gearman-plugin) \ + $(use_with memcache memcache_functions-plugins) \ + --with-logging_stats \ --without-hello-world-plugin \ ${myconf} + + # upstream TODO: + # --without-all \ + # broken atm + #$(use_with memcache memcache_stats-plugins) \ } src_compile() { @@ -77,7 +95,9 @@ src_compile() { fi } +# 5-10 min eta src_test() { + # If you want to turn off a test, rename to suffix of .DISABLED # Explicitly allow parallel make check emake check || die "tests failed" } diff --git a/dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch b/dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch new file mode 100644 index 000000000000..b023a9f3088c --- /dev/null +++ b/dev-db/drizzle/files/drizzle-2010.03.1412-ggdb3-fix.patch @@ -0,0 +1,39 @@ +diff -Nuar --exclude '*~' drizzle-2010.03.1412/m4.orig/pandora_optimize.m4 drizzle-2010.03.1412/m4//pandora_optimize.m4 +--- drizzle-2010.03.1412/m4.orig/pandora_optimize.m4 2010-03-30 13:02:33.000000000 -0700 ++++ drizzle-2010.03.1412/m4//pandora_optimize.m4 2010-04-17 09:51:53.000000000 -0700 +@@ -22,10 +22,9 @@ + dnl with using AC_CC_STD_C99 above + CC="${CC} -std=gnu99" + +- AM_CPPFLAGS="-ggdb3 ${AM_CPPFLAGS}" +- + DEBUG_CFLAGS="-O0" + DEBUG_CXXFLAGS="-O0" ++ DEBUG_CPPFLAGS="-ggdb3" + + OPTIMIZE_CFLAGS="-O3" + OPTIMIZE_CXXFLAGS="-O3" +@@ -35,9 +34,8 @@ + dnl with using AC_CC_STD_C99 above + CC="${CC} -std=c99" + +- AM_CPPFLAGS="-g ${AM_CPPFLAGS}" +- + DEBUG_CFLAGS="-O0" ++ DEBUG_CPPFLAGS="-g" + DEBUG_CXXFLAGS="-O0" + + OPTIMIZE_CFLAGS="-xHOST -O3 -no-prec-div -static" +@@ -70,10 +68,12 @@ + AS_IF([test "$with_debug" = "yes"],[ + # Debugging. No optimization. + AM_CFLAGS="${AM_CFLAGS} ${DEBUG_CFLAGS} -DDEBUG" ++ AM_CPPFLAGS="${AM_CPPFLAGS} ${DEBUG_CPPFLAGS} -DDEBUG" + AM_CXXFLAGS="${AM_CXXFLAGS} ${DEBUG_CXXFLAGS} -DDEBUG" + ],[ + # Optimized version. No debug + AM_CFLAGS="${AM_CFLAGS} ${OPTIMIZE_CFLAGS}" ++ AM_CPPFLAGS="${AM_CPPFLAGS} ${OPTIMIZE_CPPFLAGS}" + AM_CXXFLAGS="${AM_CXXFLAGS} ${OPTIMIZE_CXXFLAGS}" + ]) + ]) |