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

github.mk: fix tag prefix with single v and pkg name <> project name #1729

Merged
merged 12 commits into from Mar 26, 2017

Conversation

tonytheodore
Copy link
Member

fixes #1728

@pavelvat
Copy link
Contributor

pavelvat commented Mar 21, 2017

Maybe this variant:

cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
... \
... \
...

more unified than:

cd '$(BUILD_DIR)' && $(TARGET)-cmake \
... \
... \
... \
'$(SOURCE_DIR)'

@tonytheodore
Copy link
Member Author

How do the cmake rule examples look? We could add $(MXE_CMAKE_OPTS) and move options out of the toolchain/wrapper that complicate downstream use.

@tonytheodore
Copy link
Member Author

I'll take those BUILD_DIR changes out of this PR.

@tonytheodore
Copy link
Member Author

I'll take those BUILD_DIR changes out of this PR.

Actually, I'll leave them in - there's no functional change and they're already tested.

This PR seems covers some more cases with GH_CONF, the odd single v prefix and projects with different package names. There's another api to investigate - releases, but it shouldn't hold this up.

@tonytheodore tonytheodore changed the title [WIP] github.mk: fix tag prefix with single v github.mk: fix tag prefix with single v and pkg name <> project name Mar 22, 2017
@tonytheodore tonytheodore merged commit 124b4e0 into mxe:master Mar 26, 2017
@tonytheodore tonytheodore deleted the tag-prefix branch March 26, 2017 04:56
This was referenced Mar 26, 2017
tonytheodore added a commit to tonytheodore/mxe that referenced this pull request Apr 2, 2017
Use `.DEFAULT_GOAL` [special variable] instead of `.DEFAULT`
[built-in target] as the latter depends on include order and
can cause confusing behaviour.

`LOCAL_PKG_LIST` was [broken] in mxe#1729 and this allows for any
current `settings.mk` to work correctly. Should also fix mxe#1264
and mxe#1267 since MXE isn't going to include any other files that
set this variable in a surprising way.

[special variable]:https://www.gnu.org/software/make/manual/make.html#Special-Variables
[built-in target]:https://www.gnu.org/software/make/manual/make.html#Special-Targets
[broken]:mxe@1cf2afb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Github subdir incorrect on certain tags
2 participants