From 5ac10b90c532e075c7be4bfea477c6fe833ee7ff Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Thu, 3 Aug 2017 12:18:23 -0500
Subject: Add database support to apr-util package (#4932)

---
 .../repos/builtin/packages/apr-util/package.py     | 92 +++++++++++++++++++---
 1 file changed, 81 insertions(+), 11 deletions(-)

diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py
index 4b63e41600..6330daa4d7 100644
--- a/var/spack/repos/builtin/packages/apr-util/package.py
+++ b/var/spack/repos/builtin/packages/apr-util/package.py
@@ -25,23 +25,93 @@
 from spack import *
 
 
-class AprUtil(Package):
+class AprUtil(AutotoolsPackage):
     """Apache Portable Runtime Utility"""
+
     homepage  = 'https://apr.apache.org/'
-    url       = 'http://archive.apache.org/dist/apr/apr-util-1.5.4.tar.gz'
+    url       = 'http://archive.apache.org/dist/apr/apr-util-1.6.0.tar.gz'
+
+    version('1.6.0', '3b03dbff60728a4f4c33f5d929e8b35a')
+    version('1.5.4', '866825c04da827c6e5f53daff5569f42')
 
-    version('1.5.4',    '866825c04da827c6e5f53daff5569f42')
+    variant('crypto', default=True,  description='Enable crypto support')
+    variant('gdbm',   default=False, description='Enable GDBM support')
+    variant('pgsql',  default=False, description='Enable PostgreSQL support')
+    variant('sqlite', default=False, description='Enable sqlite DBD driver')
+    variant('odbc',   default=False, description='Enalbe ODBC support')
 
     depends_on('apr')
     depends_on('expat')
+    depends_on('libiconv')
+
+    depends_on('openssl', when='+crypto')
+    depends_on('gdbm', when='+gdbm')
+    depends_on('postgresql', when='+pgsql')
+    depends_on('sqlite', when='+sqlite')
+    depends_on('unixodbc', when='+odbc')
+
+    def configure_args(self):
+        spec = self.spec
+
+        args = [
+            '--with-apr={0}'.format(spec['apr'].prefix),
+            '--with-expat={0}'.format(spec['expat'].prefix),
+            '--with-iconv={0}'.format(spec['libiconv'].prefix),
+            # TODO: Add support for the following database managers
+            '--without-ndbm',
+            '--without-berkeley-db',
+            '--without-mysql',
+            '--without-oracle',
+        ]
+
+        if '+crypto' in spec:
+            args.extend([
+                '--with-crypto',
+                '--with-openssl={0}'.format(spec['openssl'].prefix),
+            ])
+        else:
+            args.append('--without-crypto')
+
+        if '+gdbm' in spec:
+            args.append('--with-gdbm={0}'.format(spec['gdbm'].prefix))
+        else:
+            args.append('--without-gdbm')
+
+        if '+pgsql' in spec:
+            args.append('--with-pgsql={0}'.format(spec['postgresql'].prefix))
+        else:
+            args.append('--without-pgsql')
+
+        if '+sqlite' in spec:
+            if spec.satisfies('^sqlite@3.0:3.999'):
+                args.extend([
+                    '--with-sqlite3={0}'.format(spec['sqlite'].prefix),
+                    '--without-sqlite2',
+                ])
+            elif spec.satisfies('^sqlite@2.0:2.999'):
+                args.extend([
+                    '--with-sqlite2={0}'.format(spec['sqlite'].prefix),
+                    '--without-sqlite3',
+                ])
+        else:
+            args.extend([
+                '--without-sqlite2',
+                '--without-sqlite3',
+            ])
+
+        if '+odbc' in spec:
+            args.append('--with-odbc={0}'.format(spec['unixodbc'].prefix))
+        else:
+            args.append('--without-odbc')
 
-    def install(self, spec, prefix):
+        return args
 
-        # configure, build, install:
-        options = ['--prefix=%s' % prefix]
-        options.append('--with-apr=%s' % spec['apr'].prefix)
-        options.append('--with-expat=%s' % spec['expat'].prefix)
+    def check(self):
+        # FIXME: Database driver tests fail, at least on macOS:
+        #
+        # Failed to load driver file apr_dbd_pgsql.so
+        # Failed to load driver file apr_dbd_sqlite3.so
+        # Failed to load driver file apr_dbd_odbc.so
 
-        configure(*options)
-        make()
-        make('install')
+        # Tests occassionally fail when run in parallel
+        make('check', parallel=False)
-- 
cgit v1.2.3-70-g09d2