diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-03-10 13:55:25 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-03-10 13:55:25 +0000 |
| commit | 35d3c40224f301d6700438b320e80197c9d938ef (patch) | |
| tree | 0568d95351b20f586b9fa08fe58514042cead8c2 /devel | |
| parent | 32cd528ab35f1e8cea9209b746fe2090e24dca76 (diff) | |
| download | pkgsrc-35d3c40224f301d6700438b320e80197c9d938ef.tar.gz | |
Support builtin libexpat on Darwin.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apr0/distinfo | 4 | ||||
| -rw-r--r-- | devel/apr0/patches/patch-apr-util_configure | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/devel/apr0/distinfo b/devel/apr0/distinfo index a011710865b..3a3cd86023d 100644 --- a/devel/apr0/distinfo +++ b/devel/apr0/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2014/03/10 13:44:37 jperkin Exp $ +$NetBSD: distinfo,v 1.9 2014/03/10 13:55:25 jperkin Exp $ SHA1 (httpd-2.0.65.tar.bz2) = 0183866df73c7877ba9275a075a2ece7a67f6c95 RMD160 (httpd-2.0.65.tar.bz2) = 1f0142a843486a53ba184ceb9214dc78f071e17e @@ -7,7 +7,7 @@ SHA1 (patch-aa) = c84bdb6bcb14bf6bc7ea0d8f13334dd8c3ef2ef9 SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596 SHA1 (patch-ao) = 4cbfa00dfe2ff515cbe6e94068ba7678f02fab89 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756 -SHA1 (patch-apr-util_configure) = f0942b2b3465d7b55aee83688e0617401019bb7e +SHA1 (patch-apr-util_configure) = 9600956ce050f5289a95da266c7ab33383badecd SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3 SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694 SHA1 (patch-as) = 37e70ff8b1a3344e47bcd2fe2b145a6e3e6a4562 diff --git a/devel/apr0/patches/patch-apr-util_configure b/devel/apr0/patches/patch-apr-util_configure index 3507419adb0..90dcef4b9ae 100644 --- a/devel/apr0/patches/patch-apr-util_configure +++ b/devel/apr0/patches/patch-apr-util_configure @@ -1,10 +1,10 @@ -$NetBSD: patch-apr-util_configure,v 1.1 2014/03/06 11:52:19 jperkin Exp $ +$NetBSD: patch-apr-util_configure,v 1.2 2014/03/10 13:55:25 jperkin Exp $ -Search for builtin expat in /usr/lib64 too. +Search for builtin expat in /usr/lib64 and support .dylib. --- apr-util/configure.orig 2013-06-28 17:48:52.000000000 +0000 +++ apr-util/configure -@@ -23132,6 +23132,11 @@ $as_echo_n "checking for Expat in $withv +@@ -23132,6 +23132,16 @@ $as_echo_n "checking for Expat in $withv expat_include_dir="$abs_expatdir/include" expat_ldflags="-L$abs_expatdir/lib" expat_libs="-lexpat" @@ -13,6 +13,11 @@ Search for builtin expat in /usr/lib64 too. + expat_include_dir="$abs_expatdir/include" + expat_ldflags="-L$abs_expatdir/lib64" + expat_libs="-lexpat" ++ elif test -r "$abs_expatdir/include/expat.h" -a \ ++ -r "$abs_expatdir/lib/libexpat.dylib"; then ++ expat_include_dir="$abs_expatdir/include" ++ expat_ldflags="-L$abs_expatdir/lib" ++ expat_libs="-lexpat" elif test -r "$abs_expatdir/xmlparse.h"; then expat_include_dir="$abs_expatdir" expat_ldflags="-L$abs_expatdir" |