pkgsrc-Users archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: devel/gobject-introspection on Darwin/Mac OS X?
On Fri, May 01, 2020 at 05:02:24PM -0500, Jason Bacon wrote:
> On 2020-04-24 02:16, Shay Perlstein wrote:
> > I tested the following patches on 2019Q4 branch, works fine:
> >
> >
> > https://github.com/NetBSD/pkgsrc/commit/b4d8d491f7723ee51bd406ef31461be28762d6dd?diff=unified
> >
> > https://github.com/NetBSD/pkgsrc/commit/49658c9b9992fb9fbb5b9fa88916309a61335cd7#diff-2a86ba77ec18e35ea3cc6a0da783f680
> >
> FYI, the latter does not apply in 2020Q1 or current as meson.build has
> changed significantly since 2019Q4.
>
> I tried to tweak it, but my first attempt did not work and I won't have time
> for the next couple weeks.
Took another look. Tests are wrapped in python, guessing something along
the way is clobbering LD_LIBRARY_PATH. Disabling tests gets "something"
installed (hacky patch attached - don't commit).
--
Paul Ripke
"Great minds discuss ideas, average minds discuss events, small minds
discuss people."
-- Disputed: Often attributed to Eleanor Roosevelt. 1948.
diff --git a/devel/gobject-introspection/PLIST b/devel/gobject-introspection/PLIST
index ce189ed035b..312a3a72844 100644
--- a/devel/gobject-introspection/PLIST
+++ b/devel/gobject-introspection/PLIST
@@ -166,20 +166,3 @@ share/gir-1.0/xlib-2.0.gir
share/gir-1.0/xrandr-1.3.gir
share/gobject-introspection-1.0/Makefile.introspection
share/gobject-introspection-1.0/gdump.c
-share/gobject-introspection-1.0/tests/annotation.c
-share/gobject-introspection-1.0/tests/annotation.h
-share/gobject-introspection-1.0/tests/drawable.c
-share/gobject-introspection-1.0/tests/drawable.h
-share/gobject-introspection-1.0/tests/everything.c
-share/gobject-introspection-1.0/tests/everything.h
-share/gobject-introspection-1.0/tests/foo.c
-share/gobject-introspection-1.0/tests/foo.h
-share/gobject-introspection-1.0/tests/gimarshallingtests.c
-share/gobject-introspection-1.0/tests/gimarshallingtests.h
-share/gobject-introspection-1.0/tests/gitestmacros.h
-share/gobject-introspection-1.0/tests/regress.c
-share/gobject-introspection-1.0/tests/regress.h
-share/gobject-introspection-1.0/tests/utility.c
-share/gobject-introspection-1.0/tests/utility.h
-share/gobject-introspection-1.0/tests/warnlib.c
-share/gobject-introspection-1.0/tests/warnlib.h
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index e946047a922..fdc78b66e67 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-gir_meson.build) = 428739a91aad88fcc003f0e3aaca68f1f8631a91
SHA1 (patch-giscanner_ast.py) = 06b3d8903d126028d2d5144c6d6a508209c834b9
SHA1 (patch-giscanner_gdumpparser.py) = 83d6c72d070b2e32d90131148b566a1a2fb9aa77
SHA1 (patch-giscanner_girparser.py) = 1156b7146568667dcb56ae7fecfc0f1be91b78ec
+SHA1 (patch-meson.build) = 0c9357e4f19c13db096a0721c00692e92ae2451e
SHA1 (patch-tests_scanner_Regress-1.0-expected.gir) = f6f044a24045d38d78b9c511813be8442ce45b16
SHA1 (patch-tools_compiler.c) = 799d5a086338e08378b8b249e6808e8b1a8101dc
SHA1 (patch-tools_generate.c) = 3fa74dd0e2c7658768a4278b984be38bff729d94
diff --git a/devel/gobject-introspection/patches/patch-meson.build b/devel/gobject-introspection/patches/patch-meson.build
new file mode 100644
index 00000000000..a54cb34456a
--- /dev/null
+++ b/devel/gobject-introspection/patches/patch-meson.build
@@ -0,0 +1,15 @@
+$RCSID$
+
+Disable tests as they fail on Mac OS X.
+
+--- meson.build.old 2020-05-04 12:08:41.000000000 +1000
++++ meson.build 2020-05-04 12:04:23.000000000 +1000
+@@ -217,7 +217,7 @@
+ # The tests will also run, which is not possible if they
+ # were built for a different architecture.
+ if not meson.is_cross_build()
+- subdir('tests')
++ # subdir('tests')
+ endif
+
+ install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
Home |
Main Index |
Thread Index |
Old Index