[gtk-osx] Patch berkeleydb to build with Clang



commit c4a343c4f61e1a6a677c3b0a79dde47b9f59d5f9
Author: John Ralls <jralls ceridwen us>
Date:   Mon Sep 30 14:56:02 2013 -0700

    Patch berkeleydb to build with Clang

 modulesets-stable/gtk-osx-python.modules   |    4 +++-
 modulesets-unstable/gtk-osx-python.modules |   15 ++++++++++-----
 modulesets/gtk-osx-python.modules          |    4 +++-
 3 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 18ffefb..2ce5d64 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -47,7 +47,9 @@
             makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle" />
+        repo="oracle" >
+      <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch"; strip='1'/>
+    </branch>
   </autotools>
 
   <!-- For out-of-source-tree builds (i.e., builddir is defined either
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 56dd360..b35786e 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -32,8 +32,9 @@
   </metamodule>
 
    <autotools id="berkeleydb4.8" autogen-sh="dist/configure"
-         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
-         makeinstallargs="-C build_unix install">
+         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         makeinstallargs="-C build_unix install"
+        supports-non-srcdir-builds="no">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
         repo="oracle" />
@@ -43,6 +44,7 @@
             autogen-sh="configure">
     <branch repo="python"
            module="2.7.4/Python-2.7.4.tar.xz" version="2.7.4">
+      <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch"; strip='1'/>
     </branch>
     <dependencies>
     </dependencies>
@@ -52,11 +54,14 @@
   </autotools>
 
    <autotools id="berkeleydb5.0" autogen-sh="dist/configure"
-         autogen-template=";cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
-         makeinstallargs="-C build_unix install">
+         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s 
%(autogenargs)s" makeargs="-C build_unix"
+         makeinstallargs="-C build_unix install"
+        supports-non-srcdir-builds="no">
 
     <branch module="berkeley-db/db-5.0.32.NC.tar.gz" version="5.0.32"
-        repo="oracle" />
+        repo="oracle">
+      <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch"; strip='1'/>
+    </branch>
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 22bcfa8..f0f6bae 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -40,7 +40,9 @@
          makeinstallargs="-C build_unix install">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
-        repo="oracle" />
+        repo="oracle">
+      <patch file="https://github.com/narkoleptik/os-x-berkeleydb-patch/raw/master/atomic.patch"; strip='1'/>
+    </branch>
   </autotools>
 
   <autotools id="python" autogenargs="--enable-shared"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]