Fix compilation on older Mac OS X systems by disabling new locking methods that requi...

Package-Manager: portage-2.2.00.15819-prefix/cvs/Darwin powerpc

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 3c2c110cb81bb9fb4964bad752d67d501f4d1f7f..cc04b0bc9e8e34995be7ab18cf1b0d9f1e953ac4 100644 (file)
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.331 2010/03/14 16:47:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.332 2010/03/19 18:33:37 grobian Exp $
+
+  19 Mar 2010; Fabian Groffen <grobian@gentoo.org> sqlite-3.6.23.ebuild:
+  Fix compilation on older Mac OS X systems by disabling new locking methods
+  that require features from Snow Leopard (10.6)
 
   14 Mar 2010; Raúl Porcel <armin76@gentoo.org> sqlite-3.6.21.ebuild,
   sqlite-3.6.22-r2.ebuild:

diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 12820b804e41a6515d51ee301a15d5b403369dce..5c2af35522d3d70a1ee173ea9fd0ae6d39322e3a 100644 (file)
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -31,6 +31,6 @@ EBUILD sqlite-3.6.21.ebuild 2911 RMD160 558c67302392ee2a4d08c73db57625c669087ffd
 EBUILD sqlite-3.6.22-r1.ebuild 3808 RMD160 ae53f01eb2ef79538b0616010c6f4e764e52fed0 SHA1 67c824739c77eef9daa41d22e53713b6128e20de SHA256 68cd6dccd004baf79521b7a0e553f4ca97a02f483cbd5ceadeda32714d56a010
 EBUILD sqlite-3.6.22-r2.ebuild 3995 RMD160 dbcc04546e194034dbb9cc94a7107229c53d94e3 SHA1 2e9565d9b1a3d23cb8d500410db135ddace897c3 SHA256 cbe1303a57cb3f2baa88ec3d03467570ac1745a88ad219305d8849edcdbb7f93
 EBUILD sqlite-3.6.22.ebuild 3686 RMD160 6f868fd97e29cec935b18f186ee33784558b2b05 SHA1 0d7446b41d05c5cf3ca51f2f118d5203eb0bf393 SHA256 be716ea0cb98ec713880bc085a7f62d797ef8b02cfc7db7d6568ea2d54e2de6f
-EBUILD sqlite-3.6.23.ebuild 3995 RMD160 75f9b7e6a018fa62ad0aadba3c6d3d64348ad06f SHA1 2909d87db0a1aeeb1261b5d95d6bf97ecbc4d6f4 SHA256 557bd32d208f758795157b57bd04129eb5ae0614769dc266f7b15da7237bde76
-MISC ChangeLog 45603 RMD160 f10014965666b36f9c4e31a4d10fb0ae7b69ba79 SHA1 71951e30024795139822a8c8e635aee8f4274ee9 SHA256 ddc63e07ed61ccb16aea645a8a298bedb532a5190efc43d49f469e152e022384
+EBUILD sqlite-3.6.23.ebuild 4495 RMD160 1cf1b67f03cd82645b5feb8c34edbb49e501893f SHA1 7303709aad7159cbb7bc48ecff4bfd4092117b04 SHA256 31fb9342fae660da19987d408febcc97a94dd03faf254fbd03b46782ee87083b
+MISC ChangeLog 45803 RMD160 dc2a9071a3800e5254431bcf056c53447fc7dca3 SHA1 36b7612d4c34dab6f87cce319ef0585f453153f8 SHA256 1a00e37cf1f7280b56ea96138bfcd98ef37b7907f92f742751b28ea7b48b53ea
 MISC metadata.xml 894 RMD160 fd8ba7aa7e0d9391d7d91e710547d057c7f07635 SHA1 48e94ded03dea88f4e38d273cd7d0f25014cad9b SHA256 e3afcc4357a2e5ca3d6352b501a158b7aea94240f870bb6c7ab4d74154ba37c8

diff --git a/dev-db/sqlite/sqlite-3.6.23.ebuild b/dev-db/sqlite/sqlite-3.6.23.ebuild
index be280b001b9eb11654c1cd66f1a4cc25a285ef68..c6e316b0d872de302246895880eafd5d246ac4b7 100644 (file)
--- a/dev-db/sqlite/sqlite-3.6.23.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.23.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/sqlite/sqlite-3.6.23.ebuild,v 1.1 2010/03/13 14:23:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.23.ebuild,v 1.2 2010/03/19 18:33:37 grobian Exp $
 
 EAPI="3"
 
@@ -95,6 +95,16 @@ src_configure() {
                extensions_option="dynamic-extensions"
        fi
 
+       # Starting from 3.6.23, SQLite has locking strategies that are specific to
+       # OSX.  By default they are enabled, and use semantics that only make sense
+       # on OSX.  However, they require gethostuuid() function for that, which is
+       # only available on OSX starting from 10.6 (Snow Leopard).  For earlier
+       # versions of OSX we have to disable all this nifty locking options, as
+       # suggested by upstream.
+       if [[ ${CHOST} == *-darwin[56789] ]] ; then
+               append-cppflags -DSQLITE_ENABLE_LOCKING_STYLE=0
+       fi
+
        # `configure` from amalgamation tarball doesn't support
        # --with-readline-inc and --(enable|disable)-tcl options.
        econf \