diff options
| author | tnn <tnn@pkgsrc.org> | 2015-10-17 09:50:48 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-10-17 09:50:48 +0000 |
| commit | 02a985dfd1ee0f970e394f502c03a96076fe2d39 (patch) | |
| tree | 4ef6fba08b5149c02a2b84400d8626a65180bae6 /devel | |
| parent | d4f314cc3a416badff1f32639bba92d86e1cbf22 (diff) | |
| download | pkgsrc-02a985dfd1ee0f970e394f502c03a96076fe2d39.tar.gz | |
fix build on OS X
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/pkg-config/distinfo | 4 | ||||
| -rw-r--r-- | devel/pkg-config/patches/patch-glib_configure | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo index 0787beda501..b5310bd0cca 100644 --- a/devel/pkg-config/distinfo +++ b/devel/pkg-config/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.28 2015/10/15 09:47:56 wiz Exp $ +$NetBSD: distinfo,v 1.29 2015/10/17 09:50:48 tnn Exp $ SHA1 (pkg-config-0.29.tar.gz) = f4b19d203b3896a4293af4b62c7f908063c88a5a RMD160 (pkg-config-0.29.tar.gz) = 79036ecce25b2fc74ddf03b93e082d3b70f1e73a SHA512 (pkg-config-0.29.tar.gz) = c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63 Size (pkg-config-0.29.tar.gz) = 1973875 bytes SHA1 (patch-configure) = 6847644b9df3e3e2334f7c45bcbb2d3b7734d165 -SHA1 (patch-glib_configure) = 5411687502079f143a66a045ce20961e85e98789 +SHA1 (patch-glib_configure) = 5080a19186a948ba305278cef91ec76a920429e4 SHA1 (patch-glib_glib_gtimer.c) = ee877a6c148b148a86f9087960863cfa8305bbf7 diff --git a/devel/pkg-config/patches/patch-glib_configure b/devel/pkg-config/patches/patch-glib_configure index 5aff2be2ca4..6e35dbb1da4 100644 --- a/devel/pkg-config/patches/patch-glib_configure +++ b/devel/pkg-config/patches/patch-glib_configure @@ -1,10 +1,20 @@ -$NetBSD: patch-glib_configure,v 1.3 2015/10/15 09:47:56 wiz Exp $ +$NetBSD: patch-glib_configure,v 1.4 2015/10/17 09:50:48 tnn Exp $ Fix unportable test construct. +Disable Carbon support in the bundled glib. It does not link correctly +with the Frameworks and pkg-config should not need any of those features. --- glib/configure.orig 2015-09-27 14:07:16.000000000 +0000 +++ glib/configure -@@ -5885,7 +5885,7 @@ else +@@ -5298,6 +5298,7 @@ $as_echo_n "checking for Mac OS X Carbon + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#error don't build this + #include <Carbon/Carbon.h> + #include <CoreServices/CoreServices.h> + +@@ -5885,7 +5886,7 @@ else ENABLE_ALWAYS_BUILD_TESTS_FALSE= fi |