Skip to content

Fix cross builds #179

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 2, 2024
Merged

Fix cross builds #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5133caa
CI: remove `--with-system-libmpdec` for cross builds
naveen521kk Nov 2, 2024
cfb0d23
socketmodule: fix captilization of headers
naveen521kk Nov 2, 2024
bab9ec5
makesetup: generalize the `MINGW` case
naveen521kk Nov 2, 2024
fcdb2a0
CI: move gcc cross build to Ubuntu for newer mingw-w64
lazka Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .github/workflows/mingw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,21 @@ jobs:
cross-gcc-x86_64:
runs-on: ubuntu-latest
container:
image: archlinux:base-devel
image: ubuntu:24.10
steps:
- uses: actions/checkout@v3
- name: Install deps
run: |
pacman --noconfirm -Suuy
pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake zip
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y \
gcc-mingw-w64-x86-64 \
g++-mingw-w64-x86-64 \
autoconf-archive \
autoconf \
automake \
zip \
make \
pkg-config

- uses: actions/setup-python@v4
with:
Expand All @@ -188,9 +196,6 @@ jobs:
--host=x86_64-w64-mingw32 \
--build=x86_64-pc-linux-gnu \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--with-system-libmpdec \
--without-ensurepip \
--enable-loadable-sqlite-extensions \
--with-build-python=yes
Expand Down Expand Up @@ -255,9 +260,6 @@ jobs:
--host=${{ matrix.arch }}-w64-mingw32 \
--build=x86_64-pc-linux-gnu \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--with-system-libmpdec \
--without-ensurepip \
--without-c-locale-coercion \
--enable-loadable-sqlite-extensions \
Expand Down
2 changes: 1 addition & 1 deletion Modules/makesetup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ CYGWIN*) if test $libdir = .
ExtraLibDir='$(LIBPL)'
fi
ExtraLibs="-L$ExtraLibDir -lpython\$(LDVERSION)";;
MINGW*)
*)
ExtraLibs='$(BLDLIBRARY)'
ExtraLibDepends='$(LIBRARY_DEPS)';;
esac
Expand Down
2 changes: 1 addition & 1 deletion Modules/socketmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\
# endif

/* Helpers needed for AF_HYPERV */
# include <Rpc.h>
# include <rpc.h>

/* Macros based on the IPPROTO enum, see: https://bugs.python.org/issue29515 */
#ifdef _MSC_VER
Expand Down
Loading