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

build fixes #3976

Merged
merged 1 commit into from Nov 15, 2019
Merged

build fixes #3976

merged 1 commit into from Nov 15, 2019

Conversation

dhewg
Copy link
Contributor

@dhewg dhewg commented Nov 11, 2019

This fixes 2 build error I ran into:

  • u-boot builds a python module, which currently requires installed python2 headers
    backport python3 patches and add a dependency for Python3:host, so it works everywhere
  • libgpg-error wrt gawk and variable names of reserved keywords

@@ -6,7 +6,7 @@ PKG_NAME="u-boot"
PKG_ARCH="arm aarch64"
PKG_LICENSE="GPL"
PKG_SITE="https://www.denx.de/wiki/U-Boot"
PKG_DEPENDS_TARGET="toolchain swig:host"
PKG_DEPENDS_TARGET="toolchain Python3:host swig:host"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this is superseeded by toolchain.
because Python3:host is part of the toolchain. (toolchain > toolchain:host > meson:host > Python3:host)

@InuSasha
Copy link
Member

InuSasha commented Nov 11, 2019

Thanks for your contribution.

Are the u-boot patches from upstream?
ok, i had to read commit messages, first. patches are from upstream

@MilhouseVH
Copy link
Contributor

@dhewg did you see #3965 which also includes a fix for u-boot?

@dhewg
Copy link
Contributor Author

dhewg commented Nov 11, 2019

@MilhouseVH nope, and that's certainly smaller, I wasn't sure if non-release versions are acceptable ;)
So I guess I'll rebase this with just the gpg error?

@chewitt
Copy link
Member

chewitt commented Nov 11, 2019

Looking at u-boot patchwork it's clear they are still finding issues with Python 3, so check which patches overlap (or not) .. don't assume someone else found them all.

@MilhouseVH
Copy link
Contributor

@dhewg the PR I referenced may be open for a short while (will certainly merge no later than the death of Python2) to allow for testing and during that time we can continue to bump u-boot (bringing in any remaining Python3 fixes) and eventually bumping to a release version. But yes, best to drop the u-boot changes in this PR and use the #3965 instead.

Dev snapshots are acceptable in master if there's a good reason (and avoiding multiple patches is one such reason) but tagged versions are preferred when available.

For the libgpg-error issue this is the upstream fix: gpg/libgpg-error@7865041 - I would suggest adding this patch in preference to the sed workaround.

Patch from upstream to fix the build error:
"namespace" name is not acceptable by gawk-5.0

Note: the last hunk was added manually because autohell
@dhewg
Copy link
Contributor Author

dhewg commented Nov 11, 2019

Done, but I had to add an extra hunk for Makefile.in because of autocrap

@MilhouseVH MilhouseVH merged commit fda5158 into LibreELEC:master Nov 15, 2019
@dhewg dhewg deleted the pull/build branch November 15, 2019 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants