mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-17 23:34:07 +00:00
70 lines
2.7 KiB
Diff
70 lines
2.7 KiB
Diff
|
diff --git i/glib/meson.build w/glib/meson.build
|
||
|
|
index 1da0bcd3cc601b9e..5cf8f747e8b15038 100644
|
||
|
|
--- i/glib/meson.build
|
||
|
|
+++ w/glib/meson.build
|
||
|
|
@@ -284,7 +284,7 @@ configure_file(
|
||
|
|
output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version),
|
||
|
|
configuration: gdb_conf,
|
||
|
|
install: true,
|
||
|
|
- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir'))
|
||
|
|
+ install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + glib_libdir)
|
||
|
|
)
|
||
|
|
|
||
|
|
if enable_systemtap
|
||
|
|
diff --git i/gmodule/meson.build w/gmodule/meson.build
|
||
|
|
index 191bca2446f9977e..551956599a616157 100644
|
||
|
|
--- i/gmodule/meson.build
|
||
|
|
+++ w/gmodule/meson.build
|
||
|
|
@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule')
|
||
|
|
elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl')
|
||
|
|
g_module_impl = 'G_MODULE_IMPL_DL'
|
||
|
|
libdl_dep = cc.find_library('dl')
|
||
|
|
- g_module_lib_args = '-ldl'
|
||
|
|
+ g_module_lib_args = ['-ldl']
|
||
|
|
endif
|
||
|
|
|
||
|
|
# additional checks for G_MODULE_IMPL_DL
|
||
|
|
@@ -72,8 +72,11 @@ if g_module_impl == ''
|
||
|
|
message('WARNING: No suitable GModule implementation found!')
|
||
|
|
endif
|
||
|
|
|
||
|
|
+# For pc files
|
||
|
|
+glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true')
|
||
|
|
+glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args))
|
||
|
|
+
|
||
|
|
gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl)
|
||
|
|
-gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0')
|
||
|
|
gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror)
|
||
|
|
gmoduleconf_conf.set('G_MODULE_NEED_USCORE', g_module_need_uscore)
|
||
|
|
gmoduleconf_conf.set('G_MODULE_BROKEN_RTLD_GLOBAL', g_module_broken_rtld_global)
|
||
|
|
diff --git i/gobject/meson.build w/gobject/meson.build
|
||
|
|
index aecca57c743d5956..0d39f2bbc36f816e 100644
|
||
|
|
--- i/gobject/meson.build
|
||
|
|
+++ w/gobject/meson.build
|
||
|
|
@@ -102,7 +102,7 @@ configure_file(
|
||
|
|
output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version),
|
||
|
|
configuration: gdb_conf,
|
||
|
|
install: true,
|
||
|
|
- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir'))
|
||
|
|
+ install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + glib_libdir)
|
||
|
|
)
|
||
|
|
|
||
|
|
if enable_systemtap
|
||
|
|
diff --git i/meson.build w/meson.build
|
||
|
|
index 65ab92f023257aef..ea3f64c5e8c47bcc 100644
|
||
|
|
--- i/meson.build
|
||
|
|
+++ w/meson.build
|
||
|
|
@@ -1533,6 +1533,12 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules')
|
||
|
|
# @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@
|
||
|
|
# @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@
|
||
|
|
|
||
|
|
+# HACK
|
||
|
|
+glib_conf.set('G_THREAD_LIBS', '-pthread')
|
||
|
|
+glib_conf.set('G_THREAD_CFLAGS', '-pthread')
|
||
|
|
+glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic')
|
||
|
|
+glib_conf.set('PCRE_REQUIRES', 'libpcre')
|
||
|
|
+
|
||
|
|
# Tracing: dtrace
|
||
|
|
want_dtrace = get_option('enable-dtrace')
|
||
|
|
enable_dtrace = false
|