[111001] trunk/dports/databases/db46

[larryv at macports.org]

Revision: 111001
          https://trac.macports.org/changeset/111001
Author:   larryv at macports.org
Date:     2013-09-12 23:01:48 -0700 (Thu, 12 Sep 2013)
Log Message:
-----------
db46: Run autoreconf to get a newer libtool that understands -stdlib.

Modified Paths:
--------------
    trunk/dports/databases/db46/Portfile

Added Paths:
-----------
    trunk/dports/databases/db46/files/autoreconf-fix.patch

Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile	2013-09-13 04:23:24 UTC (rev 111000)
+++ trunk/dports/databases/db46/Portfile	2013-09-13 06:01:48 UTC (rev 111001)
@@ -30,7 +30,6 @@
                 patch.${version}.4
 
 distname        db-${version}
-patch.dir       ${workpath}/${distname}
 dist_subdir     db4/${version}_6
 checksums       ${distname}${extract.suffix} \
                 md5     718082e7e35fc48478a2334b0bc4cd11 \
@@ -53,10 +52,27 @@
                 sha1    e2190185c667edb97e800495ce6eb4f95f43eb87 \
                 rmd160  f1d18e59c311fb4e1f00a3b6220269fca17df312
 
+if {[info exists configure.cxx_stdlib] &&
+    ${configure.cxx_stdlib} ne {} &&
+    [string match *clang* ${configure.cxx}]
+} then {
+    # Generate libtool that understands -stdlib.
+    use_autoreconf          yes
+    autoreconf.dir          ${worksrcpath}/dist
+    autoreconf.cmd          ${autoreconf.dir}/s_config
+    autoreconf.args         --force \
+                            --include=${prefix}/share/aclocal \
+                            --include=${autoreconf.dir}/aclocal \
+                            --include=${autoreconf.dir}/aclocal_java \
+                            --verbose
+    patchfiles-append       autoreconf-fix.patch
+    depends_build-append    port:autoconf port:automake port:libtool
+}
+
 configure.dir   ${worksrcpath}/build_unix
 build.dir       ${configure.dir}
 
-configure.cmd   ../dist/configure
+configure.cmd   ${worksrcpath}/dist/configure
 configure.args  --enable-cxx \
                 --includedir=\\\${prefix}/include/db${branch} \
                 --libdir=\\\${prefix}/lib/db${branch} \

Added: trunk/dports/databases/db46/files/autoreconf-fix.patch
===================================================================
--- trunk/dports/databases/db46/files/autoreconf-fix.patch	                        (rev 0)
+++ trunk/dports/databases/db46/files/autoreconf-fix.patch	2013-09-13 06:01:48 UTC (rev 111001)
@@ -0,0 +1,55 @@
+Index: dist/configure.ac
+===================================================================
+--- dist.orig/configure.ac
++++ dist/configure.ac
+@@ -457,12 +457,16 @@ if test "$db_cv_mingw" = "yes"; then
+ 	OSDIR=os_windows
+ 	PATH_SEPARATOR="\\\\/:"
+ 
+-	AC_DEFINE(DB_WIN32)
++	# For some reason, autoheader chokes if this is defined without
++	# a description.
++	AC_DEFINE([DB_WIN32], [1], [Some Windows crap.])
+ 	AC_DEFINE(STDC_HEADERS)
+ else
+ 	OSDIR=os
+ 	PATH_SEPARATOR="/"
+-	AC_DEFINE(HAVE_SYSTEM_INCLUDE_FILES)
++	# For some reason, autoheader chokes if this is defined without
++	# a description.
++	AC_DEFINE([HAVE_SYSTEM_INCLUDE_FILES], [1], [More Windows crap.])
+ fi
+ 
+ # Checks for include files, structures, C types.
+Index: dist/s_config
+===================================================================
+--- dist.orig/s_config
++++ dist/s_config
+@@ -3,21 +3,15 @@
+ #
+ # Build the autoconfiguration files.
+ 
+-trap 'rm -f aclocal.m4 ; exit 0' 0 1 2 3 13 15
++trap 'rm -f aclocal.m4' 0 1 2 3 13 15
+ 
+ . ./RELEASE
+ 
+-echo "autoconf: building aclocal.m4..."
+-cat aclocal/*.m4 aclocal_java/*.m4 > aclocal.m4
+-
+-echo "autoconf: running autoheader to build config.hin..."
+-rm -f config.hin
+-autoheader
+-chmod 444 config.hin
+-
+-echo "autoconf: running autoconf to build configure"
+-rm -f configure
+-autoconf
++# We need to run our libtoolize to get a libtool that understands
++# -stdlib, so use autoreconf and pass autoreconf.{pre_,post_}args as the
++# arguments to this script.
++rm -f config.hin configure
++autoreconf "$@" || exit $?
+ 
+ # Edit version information we couldn't pre-compute.
+ sed -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130912/219df48e/attachment-0001.html>