Skip to content

[libpng] fix Android ARM triplet build failure#18115

Merged
strega-nil-ms merged 7 commits intomicrosoft:masterfrom
luncliff:port/libpng
Jun 9, 2021
Merged

[libpng] fix Android ARM triplet build failure#18115
strega-nil-ms merged 7 commits intomicrosoft:masterfrom
luncliff:port/libpng

Conversation

@luncliff
Copy link
Contributor

@luncliff luncliff commented May 26, 2021

What does your PR fix?

Fix build failure of libpng targeting Android arm-android.

Port version 14 fails with the following error (install-arm-android-dbg-out.log)

...
[6/21] D:\shared\Android\Sdk\ndk\21.4.7075529\toolchains\llvm\prebuilt\windows-x86_64\bin\clang.exe -target armv7-none-linux-androideabi21 -gcc-toolchain D:/shared/Android/Sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/windows-x86_64 --sysroot=D:/shared/Android/Sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/windows-x86_64/sysroot -DPNG_ARM_NEON_OPT=2 -I. -ID:/luncliff/sources/vcpkg/buildtrees/libpng/src/v1.6.37-05658d6f1a.clean -isystem D:/luncliff/sources/vcpkg/installed/arm-android/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -mfpu=vfpv3-d16 -Wformat -Werror=format-security  -O0 -fno-limit-debug-info  -fPIC -MD -MT CMakeFiles/png_static.dir/arm/filter_neon.S.o -MF CMakeFiles\png_static.dir\arm\filter_neon.S.o.d -o CMakeFiles/png_static.dir/arm/filter_neon.S.o -c D:/luncliff/sources/vcpkg/buildtrees/libpng/src/v1.6.37-05658d6f1a.clean/arm/filter_neon.S
FAILED: CMakeFiles/png_static.dir/arm/filter_neon.S.o 
D:\shared\Android\Sdk\ndk\21.4.7075529\toolchains\llvm\prebuilt\windows-x86_64\bin\clang.exe -target armv7-none-linux-androideabi21 -gcc-toolchain D:/shared/Android/Sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/windows-x86_64 --sysroot=D:/shared/Android/Sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/windows-x86_64/sysroot -DPNG_ARM_NEON_OPT=2 -I. -ID:/luncliff/sources/vcpkg/buildtrees/libpng/src/v1.6.37-05658d6f1a.clean -isystem D:/luncliff/sources/vcpkg/installed/arm-android/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -mfpu=vfpv3-d16 -Wformat -Werror=format-security  -O0 -fno-limit-debug-info  -fPIC -MD -MT CMakeFiles/png_static.dir/arm/filter_neon.S.o -MF CMakeFiles\png_static.dir\arm\filter_neon.S.o.d -o CMakeFiles/png_static.dir/arm/filter_neon.S.o -c D:/luncliff/sources/vcpkg/buildtrees/libpng/src/v1.6.37-05658d6f1a.clean/arm/filter_neon.S
<instantiation>:18:9: error: unknown directive
        .func png_read_filter_row_sub4_neon
        ^
...

Change option PNG_ARM_NEON=on to PNG_ARM_NEON=check.

Related Issues

Which triplets are supported/not supported? Have you updated the CI baseline?

  • arm-android

Does your PR follow the maintainer guide?

Yes

@luncliff
[libpng] use check for PNG_ARM_NEON
b4e4804 
* arm-android build keeps failing
@JackBoosY JackBoosY added the category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. label May 26, 2021
@JackBoosY
Copy link
Contributor

JackBoosY commented May 26, 2021

Waiting for #18116 merge.

@JackBoosY JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels May 26, 2021
@luncliff
Copy link
Contributor Author

luncliff commented May 28, 2021

I found arm64-osx triplet build is failing. Let me handle the issue in this PR.

@luncliff luncliff marked this pull request as draft May 28, 2021 02:48
@JackBoosY JackBoosY removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label May 28, 2021
JackBoosY
JackBoosY suggested changes May 31, 2021
View reviewed changes
luncliff and others added 2 commits May 31, 2021 13:32
@luncliff @JackBoosY
Update ports/libpng/vcpkg.json
dda65fd 
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
@luncliff
[libpng] update baseline
dbce216
@JackBoosY
Copy link
Contributor

JackBoosY commented May 31, 2021

Please ping me if this PR is ready for review.

@luncliff luncliff marked this pull request as ready for review May 31, 2021 06:36
@luncliff
Copy link
Contributor Author

luncliff commented Jun 1, 2021

I checked triplets and build was successful with local machine. I think it will be fine when CI passes.

@JackBoosY
Copy link
Contributor

JackBoosY commented Jun 2, 2021

LGTM.

@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jun 2, 2021
@strega-nil-ms
Copy link
Contributor

strega-nil-ms commented Jun 9, 2021

Thanks @luncliff :)

@strega-nil-ms strega-nil-ms merged commit f6eb4c5 into microsoft:master Jun 9, 2021
@luncliff luncliff deleted the port/libpng branch June 10, 2021 05:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@JackBoosY JackBoosY

Labels

category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@luncliff @JackBoosY @strega-nil-ms