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.

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

Jump to bottom

[qca]support linux-osx-static build #13964

Merged
merged 20 commits into from
Oct 12, 2020
Merged

[qca]support linux-osx-static build #13964

merged 20 commits into from
Oct 12, 2020

Conversation

longhuan2018
Copy link
Contributor

Upgrade qca library to 2.3.1
Make qca compile under linux and osx
Support qca static library compilation

@longhuan2018
Merge pull request #1 from microsoft/master
4dac6c2 
merge
@longhuan2018
Merge pull request #3 from microsoft/master
af60ca0 
Update from vcpkg
@longhuan2018
Merge pull request #4 from microsoft/master
087655f 
Update from vcpkg
@longhuan2018
Merge pull request #8 from microsoft/master
c1a19a4 
merge from vcpkg
@longhuan2018
Merge pull request #9 from microsoft/master
657efd4 
merge from vcpkg
@longhuan2018
Merge pull request #10 from microsoft/master
842b78e 
update from vcpkg
@longhuan2018
Merge pull request #11 from microsoft/master
64c225d 
merge from vcpkg
@longhuan2018
Merge pull request #12 from microsoft/master
407205c 
update from vcpkg
@longhuan2018
Merge pull request #13 from microsoft/master
813ef5d 
merge from vcpkg
@longhuan2018
Merge pull request #16 from microsoft/master
3823c53 
merge from vcpkg
@longhuan2018
Merge pull request #18 from microsoft/master
1851503 
merge from vcpkg
@longhuan2018
support linux, osx, static build
ae4b824
@NancyLi1013 NancyLi1013 added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision labels Oct 12, 2020
@NancyLi1013
Copy link
Contributor

The failure on osx:

-- Performing post-build validation
The folder /include is empty or not present. This indicates the library was not correctly installed.
Found 1 error(s). Please correct the portfile:
    /Volumes/data/work/1/s/ports/qca/portfile.cmake
-- Performing post-build validation done

NancyLi1013
NancyLi1013 reviewed Oct 12, 2020
View reviewed changes
Copy link
Contributor

@NancyLi1013 NancyLi1013 left a comment

Choose a reason for hiding this comment

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

Could you please also update this

file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/qca)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/qca/COPYING ${CURRENT_PACKAGES_DIR}/share/qca/copyright)

as

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)?

ports/qca/portfile.cmake Outdated Show resolved Hide resolved
ports/qca/portfile.cmake Outdated Show resolved Hide resolved
ports/qca/portfile.cmake Outdated Show resolved Hide resolved
ports/qca/portfile.cmake Outdated Show resolved Hide resolved
ports/qca/portfile.cmake Outdated Show resolved Hide resolved
@NancyLi1013
Copy link
Contributor

Related PR #13961

longhuan2018 and others added 6 commits October 12, 2020 15:55
@longhuan2018 @NancyLi1013
Update ports/qca/portfile.cmake
2e73d04 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018 @NancyLi1013
Update ports/qca/portfile.cmake
1c39b91 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018 @NancyLi1013
Update ports/qca/portfile.cmake
2c8a560 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018 @NancyLi1013
Update ports/qca/portfile.cmake
73b570e 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018 @NancyLi1013
Update ports/qca/portfile.cmake
c53e2c3 
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
@longhuan2018
change install copyright
13c11cf
@longhuan2018
Copy link
Contributor Author

Now this PR has been compiled. My PR already contains the content of PR #13961. @NancyLi1013

@NancyLi1013
Copy link
Contributor

@longhuan2018
Thanks for your efforts.
Of course, PR #13961 is just a update, which has been included in your PR.

LGTM now.

@NancyLi1013 NancyLi1013 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Oct 12, 2020
@dan-shaw dan-shaw merged commit 9bf57ae into microsoft:master Oct 12, 2020
@dan-shaw dan-shaw mentioned this pull request Oct 12, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Assignees

@NancyLi1013 NancyLi1013

Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@longhuan2018 @NancyLi1013 @dan-shaw