Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson build test #11863

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion mingw-w64-gobject-introspection/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-runtime")
pkgver=1.72.0
pkgrel=2
pkgrel=3
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
url="https://live.gnome.org/GObjectIntrospection"
Expand Down
7 changes: 5 additions & 2 deletions mingw-w64-meson/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ source=("https://github.com/mesonbuild/${_realname}/releases/download/${pkgver}/
'color-term.patch'
'0002-Default-to-sys.prefix-as-the-default-prefix.patch'
'0004-fix-gtk-doc.patch'
'install-man.patch')
'install-man.patch'
'a.diff')
sha256sums=('3b51d451744c2bc71838524ec8d96cd4f8c4793d5b8d5d0d0a9c8a4f7c94cd6f'
'5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0'
'675e79a0fc78b4236f5b803ffd2e745cb2ff125c9b4a03657773915183a4e19a'
'0f9177102976bbcbdf50c1da49842783a0c77be939e839f1bf91dcaba6a5cdee'
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84')
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84'
'fcb7a042eb4e727fa72b83c3d5aa4890104076806d5f1b258d6b04f5d68e8bbf')

prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
Expand All @@ -32,6 +34,7 @@ prepare() {
patch -Np1 -i "${srcdir}"/0002-Default-to-sys.prefix-as-the-default-prefix.patch
patch -Np1 -i "${srcdir}"/0004-fix-gtk-doc.patch
patch -Np1 -i "${srcdir}"/install-man.patch
patch -Np1 -i "${srcdir}"/a.diff
}

build() {
Expand Down
23 changes: 23 additions & 0 deletions mingw-w64-meson/a.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- meson-0.62.2/mesonbuild/scripts/meson_exe.py.orig 2022-06-26 20:00:30.887030500 +0200
+++ meson-0.62.2/mesonbuild/scripts/meson_exe.py 2022-06-26 20:49:04.403388400 +0200
@@ -101,6 +101,9 @@
return 0

def run(args: T.List[str]) -> int:
+ import gc, time
+ gc.disable()
+ time.sleep(0.1)
global options
parser = buildparser()
options, cmd_args = parser.parse_known_args(args)
@@ -119,7 +122,9 @@
else:
exe = ExecutableSerialisation(cmd_args, capture=options.capture, feed=options.feed)

- return run_exe(exe)
+ res = run_exe(exe)
+ os._exit(res)
+ return res

if __name__ == '__main__':
sys.exit(run(sys.argv[1:]))
14 changes: 11 additions & 3 deletions mingw-w64-python-setuptools/0005-execv-warning.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
--- setuptools-51.1.2/launcher.c.orig 2021-01-12 11:59:21.949463100 +0530
+++ setuptools-51.1.2/launcher.c 2021-01-12 12:05:36.267872900 +0530
@@ -315,7 +315,11 @@
--- setuptools-59.8.0/launcher.c.orig 2022-06-26 16:45:05.156368100 +0200
+++ setuptools-59.8.0/launcher.c 2022-06-26 16:47:29.148881100 +0200
@@ -255,6 +255,7 @@
fprintf(stderr, "failed to get exit code from process.\n");
return 0;
}
+ fprintf(stderr, "!!!!!exit code: %lu\n", return_value);
return return_value;
}

@@ -368,7 +369,11 @@

if (is_gui) {
/* Use exec, we don't need to wait for the GUI to finish */
Expand Down
2 changes: 1 addition & 1 deletion mingw-w64-python-setuptools/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ sha256sums=('c04b44a57a6265fe34a4a444e965884716d34bae963119a76353434d6f18e450'
'7b196884ac0151801f9638dabbf9a789fa9070a3b07a4c9e625c5523e8d47387'
'fa54581e3dddb9f4edd332dedbc101f48939a9ca5878e13cf9cf9b3408bc8c22'
'39503256652c7c23ce07e26539e8123d269eb5c09f5d9b07e5784b2d7fb8c96f'
'a356b0663f67a296624d1b178b42437b380b48a4bbe05a560d3bf29e93a4c623'
'76763159c5cd545ab68835082af33905bdbd38f030d480f346617467908b0698'
'dbdd96a7ead797b2db9f02dfe19ce853d3775337ccf8fd836377fe3c2a9d1c24'
'cb897bc7292a733167fa48b5ca18323d76d3374683a7f5e9986c9df63f5332cc'
'db9a6e2c18d4adfd7c88d17d28268d57afba8845556c1cf1e5c92f513bf36847')
Expand Down