diff options
| author | Robin Haberkorn <rhaberkorn@fmsbw.de> | 2026-01-10 17:13:04 +0100 |
|---|---|---|
| committer | Robin Haberkorn <rhaberkorn@fmsbw.de> | 2026-01-10 17:13:04 +0100 |
| commit | 91d6e3639e6a0fa04ee897695a72b22069e64e78 (patch) | |
| tree | fdfbadd93c4d6451a3d5b03bbb7180905bbcdf9e | |
| parent | d092657aa6eda21da9d676c702418fca66ba7ce7 (diff) | |
fixup 35aac4f06523ba6418df4d2e436fa27c18bd5b11: make sure to link Windows CI builds against the manually built PDCursesMod v4.5.4.
| -rwxr-xr-x | .fmsbw/10-freebsd14-msys-sciteco | 4 | ||||
| -rw-r--r-- | .fmsbw/images/Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.fmsbw/10-freebsd14-msys-sciteco b/.fmsbw/10-freebsd14-msys-sciteco index d04593f..f8e1f40 100755 --- a/.fmsbw/10-freebsd14-msys-sciteco +++ b/.fmsbw/10-freebsd14-msys-sciteco @@ -68,7 +68,7 @@ mkdir build-wingui build-wincon cd build-wingui # See above, we use a manually built PDCursesMod v4.5.4 #export CURSES_LIBS="-lpdcurses_wingui -lgdi32 -lcomdlg32 -lwinmm" -export CURSES_LIBS="-L/opt/PDCursesMod/wingui -lpdcurses -lgdi32 -lcomdlg32 -lwinmm" +export CURSES_LIBS="/opt/PDCursesMod/wingui/pdcurses.a -lgdi32 -lcomdlg32 -lwinmm" ../configure --host=x86_64-w64-mingw32 \ --with-interface=pdcurses-gui --enable-html-docs --program-prefix=g \ --with-scitecodatadir=. \ @@ -80,7 +80,7 @@ make install-strip cd ../build-wincon # See above, we use a manually built PDCursesMod v4.5.4 #export CURSES_LIBS="-lpdcurses_wincon -lgdi32 -lwinmm" -export CURSES_LIBS="-L/opt/PDCursesMod/wincon -lpdcurses -lgdi32 -lwinmm" +export CURSES_LIBS="/opt/PDCursesMod/wincon/pdcurses.a -lgdi32 -lwinmm" ../configure --host=x86_64-w64-mingw32 \ --with-interface=pdcurses --enable-html-docs \ --with-scitecodatadir=. \ diff --git a/.fmsbw/images/Makefile b/.fmsbw/images/Makefile index 74b54e5..0878cc2 100644 --- a/.fmsbw/images/Makefile +++ b/.fmsbw/images/Makefile @@ -16,9 +16,10 @@ freebsd14-msys-sciteco: buildah from --name $@-working --network=host freebsd14-sciteco buildah run $@-working pkg install llvm21 gnugrep gmake coreutils gsed gawk \ git wget gnupg bash groff zip autoconf automake libtool python3 - buildah run $@-working pkg remove FreeBSD-clang + #buildah run $@-working pkg remove FreeBSD-clang buildah run $@-working pkg clean -a - buildah run $@-working git clone --depth=1 https://github.com/HolyBlackCat/quasi-msys2.git /opt/quasi-msys2 + # Cannot check out with --depth=1 as we need a particular commit. + buildah run $@-working git clone https://github.com/HolyBlackCat/quasi-msys2.git /opt/quasi-msys2 buildah config --workingdir /opt/quasi-msys2 $@-working buildah run $@-working git checkout e41c4d0f7dde15031132348875d1d01c8d0ea857 buildah run $@-working ln -s /usr/local/bin/gpgv2 /usr/local/bin/gpgv |