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

[vcpkg scripts] Crosscompiling fixes #26617

Merged
merged 55 commits into from
Oct 13, 2022

Conversation

Neumann-A
Copy link
Contributor

No description provided.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@LilyWangLL LilyWangLL changed the title [scripts] A few osx fixes [vcpkg scripts] A few osx fixes Sep 1, 2022
@LilyWangLL LilyWangLL added the category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed label Sep 1, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for vcpkg-cmake-get-vars have changed but the version was not updated
version: 2022-05-10#1
old SHA: b50ca3d20736304215fbd82c102d4552457255bb
new SHA: 5be9eb51bb1f156ca477a9f7b594ff756368d16b
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@vicroms vicroms self-assigned this Sep 29, 2022
@vicroms
Copy link
Member

vicroms commented Oct 3, 2022

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

github-actions[bot]
github-actions bot previously approved these changes Oct 4, 2022
@Neumann-A
Copy link
Contributor Author

Hmm don't know what happened to jemalloc on osx. Has been green in 184abe3 and only thing I did was merge with master. Looks like a concurrency issue?

@dg0yt
Copy link
Contributor

dg0yt commented Oct 4, 2022

Hmm don't know what happened to jemalloc on osx. Has been green in 184abe3 and only thing I did was merge with master. Looks like a concurrency issue?

install: mkdir /Users/vagrant/Data/packages/jemalloc_x64-osx/Users/vagrant/Data/installed: File exists

This is a typical symptom of concurrency issues during make install on osx. We need a DISABLE_PARALLEL_INSTALL and/or a reliable mkdir wrapper for osx.

@JackBoosY
Copy link
Contributor

Should we wait for #27105 merge or just rerun the pipeline test?

@LilyWangLL LilyWangLL removed the info:reviewed Pull Request changes follow basic guidelines label Oct 8, 2022
…thers

# Conflicts:
#	ports/vcpkg-cmake/vcpkg.json
#	versions/baseline.json
#	versions/v-/vcpkg-cmake.json
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 472e9f1a8bc5349ec21926fcfc6b2eb917cba01f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index f2cb3b7..5b1a5cb 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7645,7 +7645,7 @@
       "port-version": 1
     },
     "vcpkg-cmake-get-vars": {
-      "baseline": "2022-05-10",
+      "baseline": "2022-09-04",
       "port-version": 1
     },
     "vcpkg-get-python-packages": {

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Oct 13, 2022
@vicroms vicroms merged commit d8e60ef into microsoft:master Oct 13, 2022
@Neumann-A Neumann-A deleted the fix_cpp_osx_and_others branch October 13, 2022 16:52
Comment on lines +77 to +78
string(REGEX MATCHALL "( |^)(-D|-isysroot|--sysroot=|-isystem|-m?[Aa][Rr][Cc][Hh]|--target=|-target) ?[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}")
string(REGEX MATCHALL "( |^)(-D|-isysroot|--sysroot=|-isystem|-m?[Aa][Rr][Cc][Hh]|--target=|-target) ?[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}")
Copy link
Contributor

@dg0yt dg0yt May 3, 2023

Choose a reason for hiding this comment

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

@Neumann-A Do you remember why you remove --target from CFLAGSCFPFLAGS here?
It is explicitly injected into the flags by scripts/get_cmake_vars/CMakeLists.txt.
Removing this flag breaks android toolchains. (CMake selects clang for compiler, so --target=x86_64-none-linux-android21 etc. is needed to pick the right includes.) LDFLAGS still carries the option.

Copy link
Contributor

Choose a reason for hiding this comment

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

From building luajit (WIP):

ld: error: undefined symbol: _IO_putc
>>> referenced by luajit.c:150 (/home/dg0yt/Projekte/vcpkg/vcpkg/buildtrees/luajit/x64-android-dbg/src/luajit.c:150)
>>>               luajit.o:(print_jit_status)
>>> referenced by luajit.c:153 (/home/dg0yt/Projekte/vcpkg/vcpkg/buildtrees/luajit/x64-android-dbg/src/luajit.c:153)
>>>               luajit.o:(print_jit_status)
>>> referenced by stdio.h:81 (/usr/lib/gcc/x86_64-linux-gnu/7.5.0/../../../../x86_64-linux-gnu/include/bits/stdio.h:81)
>>>               lib_base.o:(lj_cf_print) in archive libluajit.a
>>> referenced 1 more times

some time after:

/<android-ndk-r25c>/toolchains/llvm/prebuilt/linux-x86_64/bin/clang  -O2 -fomit-frame-pointer -Wall   -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -U_FORTIFY_SOURCE  -DLUA_ROOT=\"/home/dg0yt/Projekte/vcpkg/vcpkg/installed/x64-android/debug\" -DLUA_MULTILIB=\"lib\" -fno-stack-protector -DLUAJIT_UNWIND_EXTERNAL  -g -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -Wformat -Werror=format-security -fPIC -fno-limit-debug-info -c -o luajit.o luajit.c

Copy link
Contributor

Choose a reason for hiding this comment

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

Ignore. I found the right track now.
TLDR: There is CFLAGS and there is CPPFLAGS, and I should use both...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Some people (meson) would argue all flags have to go into CC / CXX instead.

@dg0yt dg0yt mentioned this pull request May 3, 2023
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants