Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
lazka committed Jun 26, 2022
1 parent 239b11b commit a310e88
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ jobs:
- name: CI-Build
shell: msys2 {0}
id: build
continue-on-error: true
run: |
cd /C/_
if [[ "$MSYSTEM" != "${{ matrix.msystem }}" ]]; then
Expand All @@ -84,7 +85,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.msystem }}-packages
path: C:/_/artifacts/*.pkg.tar.*
path: C:/_/artifacts/*

- name: "Clean up runner"
if: ${{ always() }}
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=('a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0'
'5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0'
'675e79a0fc78b4236f5b803ffd2e745cb2ff125c9b4a03657773915183a4e19a'
'0f9177102976bbcbdf50c1da49842783a0c77be939e839f1bf91dcaba6a5cdee'
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84')
'0682a36cb75e545a78b81293303835a16171f25baf949905dc08029436efff84'
'301a59700fc43252e4ed0bf40b08390cdcd91f63f0dd54736079c73b9c224623')

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
24 changes: 24 additions & 0 deletions mingw-w64-meson/a.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--- 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:00:37.694319400 +0200
@@ -25,6 +25,8 @@

options = None

+_fileobj = None
+
def buildparser() -> argparse.ArgumentParser:
parser = argparse.ArgumentParser(description='Custom executable wrapper for Meson. Do not run on your own, mmm\'kay?')
parser.add_argument('--unpickle')
@@ -101,7 +103,11 @@
return 0

def run(args: T.List[str]) -> int:
- global options
+ import time, faulthandler
+ global options, _fileobj
+ _fileobj = open("C:/_/artifacts/" + str(time.time()) + ".txt", "wb+")
+ faulthandler.enable(_fileobj, all_threads=False)
+
parser = buildparser()
options, cmd_args = parser.parse_known_args(args)
# argparse supports double dash to separate options and positional arguments,

0 comments on commit a310e88

Please sign in to comment.