From 49cd76ddb2e1d252168570771772c710bbc7aa12 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 9 Mar 2024 23:55:19 +0100 Subject: [PATCH] msys2-runtime-3.5: adjust some files After copying the files verbatim from `msys2-runtime`, this change reflects that we want to build the MSYS2 runtime v3.5.x in this package. Note: To make things easier to review, the patches are not yet adjusted by running `./update-patches.sh`. That will be left for the next commit. Signed-off-by: Johannes Schindelin --- msys2-runtime-3.5/PKGBUILD | 46 +++++++---------------------- msys2-runtime-3.5/README.md | 4 +-- msys2-runtime-3.5/tests/do_new.bat | 6 ---- msys2-runtime-3.5/tests/do_new2.bat | 6 ---- msys2-runtime-3.5/tests/do_old.bat | 6 ---- 5 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 msys2-runtime-3.5/tests/do_new.bat delete mode 100644 msys2-runtime-3.5/tests/do_new2.bat delete mode 100644 msys2-runtime-3.5/tests/do_old.bat diff --git a/msys2-runtime-3.5/PKGBUILD b/msys2-runtime-3.5/PKGBUILD index d0e519a1..ffbca55b 100644 --- a/msys2-runtime-3.5/PKGBUILD +++ b/msys2-runtime-3.5/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Alexey Pavlov # Contributor: Ray Donnelly -pkgbase=msys2-runtime -pkgname=('msys2-runtime' 'msys2-runtime-devel') -pkgver=3.4.10 -pkgrel=5 +pkgbase=msys2-runtime-3.5 +pkgname=('msys2-runtime-3.5' 'msys2-runtime-3.5-devel') +pkgver=3.5.1 +pkgrel=1 pkgdesc="Cygwin POSIX emulation engine" arch=('x86_64') url="https://www.cygwin.com/" @@ -250,18 +250,13 @@ build() { LC_ALL=C make LC_ALL=C make -j1 DESTDIR="${srcdir}"/dest install - #pushd ${CHOST}/winsup/cygwin > /dev/null - #LANG=C make libmsys2_s.a - #cp libmsys2_s.a "${srcdir}"/dest/usr/${CHOST}/lib/ - #popd > /dev/null - rm -rf "${srcdir}"/dest/etc } -package_msys2-runtime() { +package_msys2-runtime-3.5() { pkgdesc="Posix emulation engine for Windows" - conflicts=('catgets' 'libcatgets' 'msys2-runtime-3.4') - replaces=('catgets' 'libcatgets' 'msys2-runtime-3.4') + conflicts=('catgets' 'libcatgets' 'msys2-runtime-3.3' 'msys2-runtime') + replaces=('catgets' 'libcatgets') mkdir -p "${pkgdir}"/usr cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/ @@ -273,11 +268,11 @@ package_msys2-runtime() { cp -rf "${srcdir}"/dest/usr/share "${pkgdir}"/usr/ } -package_msys2-runtime-devel() { +package_msys2-runtime-3.5-devel() { pkgdesc="MSYS2 headers and libraries" depends=("msys2-runtime=${pkgver}") - conflicts=('libcatgets-devel' 'msys2-runtime-3.4-devel') - replaces=('libcatgets-devel' 'msys2-runtime-3.4-devel') + conflicts=('libcatgets-devel' 'msys2-runtime-3.3-devel' 'msys2-runtimedevel') + replaces=('libcatgets-devel') mkdir -p "${pkgdir}"/usr/bin cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/ @@ -288,24 +283,3 @@ package_msys2-runtime-devel() { cp -rLf "${srcdir}"/dest/usr/${CHOST}/lib "${pkgdir}"/usr/ } - -# return 0 -# To hack on this: -# cd /c/repo-MSYS2/msys2-runtime/ -# pushd src/build-i686-pc-msys -# LANG=C make && make -j1 DESTDIR=/c/repo-MSYS2/msys2-runtime/src/dest install -# popd -# makepkg -sRLf -# pacman -U msys2-runtime*.xz - -# Quicker: -# open cmd.exe -# set "PATH=C:\\msys32\\usr\\bin;%PATH%" -# E: -# pushd E:\m2\repo-MSYS2\msys2-runtime\src\build-i686-pc-msys\i686-pc-msys\winsup\cygwin -# C:/msys32/usr/bin/bash -c "LANG=C && make" -# copy /y new-msys-2.0.dll C:\msys32\usr\bin\msys-2.0.dll -# popd -# C: -# C:/msys32/usr/bin/strace ls / > C:/strace.txt 2>&1 -# diff --git a/msys2-runtime-3.5/README.md b/msys2-runtime-3.5/README.md index 1c3a71bf..adf8e9fa 100644 --- a/msys2-runtime-3.5/README.md +++ b/msys2-runtime-3.5/README.md @@ -1,4 +1,4 @@ The patches for this package are auto generated and managed in git: -https://github.com/msys2/Cygwin +https://github.com/msys2/msys2-runtime/tree/msys2-3.5.1 -Run `./update-patches.sh` to re-create the patches. \ No newline at end of file +Run `./update-patches.sh` to re-create the patches. diff --git a/msys2-runtime-3.5/tests/do_new.bat b/msys2-runtime-3.5/tests/do_new.bat deleted file mode 100644 index 40b31134..00000000 --- a/msys2-runtime-3.5/tests/do_new.bat +++ /dev/null @@ -1,6 +0,0 @@ -set MSYS64=%1 -set REPOMSYS2=%2 -%MSYS64%/usr/bin/bash.exe --login -i -c "pacman -U --noconfirm /var/cache/pacman/pkg/msys2-runtime*.xz" -%MSYS64%/usr/bin/bash.exe --login -i -c "LANG=C cd %REPOMSYS2%/msys2-runtime && sed -i 's,^#define DISABLE_NEW_STUFF .*$,#define DISABLE_NEW_STUFF 0,g' src/msys2-runtime/winsup/cygwin/mount.cc && sed -i 's,^#define ONLY_USE_NEW_STUFF .*$,#define ONLY_USE_NEW_STUFF 0,g' src/msys2-runtime/winsup/cygwin/mount.cc && pushd src/build-x86_64-pc-msys && make EXTRA_CPPFLAGS=fbreak-it && make -j1 DESTDIR=%REPOMSYS2%/msys2-runtime/src/dest install && rm -rf %REPOMSYS2%/msys2-runtime/src/dest/etc && popd && makepkg -RLf && pacman -U --noconfirm msys2-runtime*.xz && exit" -%MSYS64%/usr/bin/strace.exe %MSYS64%/usr/bin/ls.exe /bin > meh-bin-new.txt -%MSYS64%/usr/bin/strace.exe %MSYS64%/usr/bin/g++ > meh-g++-new.txt diff --git a/msys2-runtime-3.5/tests/do_new2.bat b/msys2-runtime-3.5/tests/do_new2.bat deleted file mode 100644 index 27a0a834..00000000 --- a/msys2-runtime-3.5/tests/do_new2.bat +++ /dev/null @@ -1,6 +0,0 @@ -set MSYS64=%1 -set REPOMSYS2=%2 -%MSYS64%/usr/bin/bash.exe --login -i -c "pacman -U --noconfirm /var/cache/pacman/pkg/msys2-runtime*.xz" -%MSYS64%/usr/bin/bash.exe --login -i -c "LANG=C cd %REPOMSYS2%/msys2-runtime && sed -i 's,^#define DISABLE_NEW_STUFF .*$,#define DISABLE_NEW_STUFF 0,g' src/msys2-runtime/winsup/cygwin/mount.cc && sed -i 's,^#define ONLY_USE_NEW_STUFF .*$,#define ONLY_USE_NEW_STUFF 1,g' src/msys2-runtime/winsup/cygwin/mount.cc && pushd src/build-x86_64-pc-msys && make EXTRA_CPPFLAGS=fbreak-it && make -j1 DESTDIR=%REPOMSYS2%/msys2-runtime/src/dest install && rm -rf %REPOMSYS2%/msys2-runtime/src/dest/etc && popd && makepkg -RLf && pacman -U --noconfirm msys2-runtime*.xz && exit" -%MSYS64%/usr/bin/strace.exe %MSYS64%/usr/bin/ls.exe /bin > meh-bin-new2.txt -%MSYS64%/usr/bin/strace.exe %MSYS64%/usr/bin/g++ > meh-g++-new2.txt diff --git a/msys2-runtime-3.5/tests/do_old.bat b/msys2-runtime-3.5/tests/do_old.bat deleted file mode 100644 index 8ded94e8..00000000 --- a/msys2-runtime-3.5/tests/do_old.bat +++ /dev/null @@ -1,6 +0,0 @@ -set MSYS64=%1 -set REPOMSYS2=%2 -%MSYS64%/usr/bin/bash.exe --login -i -c "pacman -U --noconfirm /var/cache/pacman/pkg/msys2-runtime*.xz" -%MSYS64%/usr/bin/bash.exe --login -i -c "LANG=C cd %REPOMSYS2%/msys2-runtime && sed -i 's,^#define DISABLE_NEW_STUFF .*$,#define DISABLE_NEW_STUFF 1,g' ./src/msys2-runtime/winsup/cygwin/mount.cc && pushd src/build-x86_64-pc-msys && make EXTRA_CPPFLAGS=fbreak-it && make -j1 DESTDIR=%REPOMSYS2%/msys2-runtime/src/dest install && rm -rf %REPOMSYS2%/msys2-runtime/src/dest/etc && popd && makepkg -RLf && pacman -U --noconfirm msys2-runtime*.xz && exit" -%MSYS64%/usr/bin/strace.exe %MSYS64%/usr/bin/ls.exe /bin > meh-bin-old.txt -%MSYS64%/usr/bin/strace.exe %MSYS64%/usr/bin/g++ > meh-g++-old.txt