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

[liblzma] Fix build failure #7481

Merged
merged 6 commits into from
Feb 4, 2020
Merged

Conversation

AlvinZhangH
Copy link
Contributor

@AlvinZhangH AlvinZhangH commented Jul 31, 2019

User add set(VCPKG_BUILD_TYPE debug) in custom triplet, however, in liblzma portfile, it use file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include), and it doesn’t copy headers to installed/triplet/include folder.
So post-build validation failed, the folder include is not present:
Change
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
To

if (VCPKG_BUILD_TYPE STREQUAL debug)
    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include)
else()
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
endif()

Relate: #7426.

@AlvinZhangH AlvinZhangH added the info:internal This PR or Issue was filed by the vcpkg team. label Jul 31, 2019
@AlvinZhangH AlvinZhangH changed the title [liblzma] Fix build failure #7426 [liblzma] Fix build failure Jul 31, 2019
@Rastaban
Copy link
Contributor

Could you also bump the CONTROL version to 5.2.4-3

@cenit
Copy link
Contributor

cenit commented Aug 1, 2019

But if you build both configs (like in a default triplet), then what happens? Is the overwrite clean?

@PhoebeHui
Copy link
Contributor

PhoebeHui commented Aug 9, 2019

Tesseract is only failed port here, it's not related to Alvin’s change, it also failed on master branch.

Tesseract failed due to support libarchive in version 4.1, but lacking of dependency libraries(bzip2, Lz4, libxml2, openssl, lzo), after libarchive installed, tessarct find installed/x64-linux/debug/lib/libarchive.a, but can’t find its dependency.

Summit PR #7613 to fix it.

@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@PhoebeHui PhoebeHui self-assigned this Jan 14, 2020
@PhoebeHui
Copy link
Contributor

/azp run

@PhoebeHui
Copy link
Contributor

@AlvinZhangH , the CI on OSX failed, please remove quantlib:x64-os from ci.baseline.txt

##[error] PASSING, REMOVE FROM FAIL LIST: quantlib:x64-osx (/Users/vagrant/azure-agent/_work/2/s/scripts/ci.baseline.txt)

Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

LGTM

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Jan 17, 2020
@ras0219-msft ras0219-msft merged commit 319a54e into microsoft:master Feb 4, 2020
@ras0219-msft
Copy link
Contributor

Thanks for the PR!

@cenit VCPKG_BUILD_TYPE is either blank, "release", or "debug"; the default build is blank. This PR does handle each case correctly.

KineticTheory pushed a commit to KineticTheory/vcpkg that referenced this pull request Feb 17, 2020
* fix 7426 issue

* fix 7426 issue -change the CONTROL file

* [liblzma] Remove quantlib:x64-os from ci.baseline.txt

* [liblzma] Update the CONTROL version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants