mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 02:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2ece8fedb9
vcpkg/ports/libvpx/0002-Fix-nasm-debug-format-flag.patch

22 lines
807 B
Diff
Raw Normal View History

[libvpx] switch from yasm to nasm (#14545) * [libvpx] switch from yasm to nasm * [vcpkg] install nasm on azure for osx * Revert "[vcpkg] install nasm on azure for osx" This reverts commit f65ad1bdadb7b7b3a3b056186665f102b4f9aded. * [VMSS] Install nasm on OSX * [libvpx] bump port version * [libvpx] Add --as=nasm for non-MSVC triplets * [libvpx] Fix nasm debug format flag * Back out nasm change applied in https://github.com/microsoft/vcpkg/pull/15258 Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Long Nguyen <nguyen.long.908132@gmail.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-12-30 07:43:54 +08:00
diff --git a/build/make/configure.sh b/build/make/configure.sh
[libvpx] Update to latest and add support for arm64 on macOS (#18183) * [libvpx] Update to latest and add support for arm64 on macOS * [libvpx] x-add-version * [libvpx] Restore patch line endings * [libvpx] x-add-version * Update ports/libvpx/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * [libvpx] x-add-version Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2021-06-11 02:44:46 +08:00
index 81d30a16c..d4f19cd97 100644
[libvpx] switch from yasm to nasm (#14545) * [libvpx] switch from yasm to nasm * [vcpkg] install nasm on azure for osx * Revert "[vcpkg] install nasm on azure for osx" This reverts commit f65ad1bdadb7b7b3a3b056186665f102b4f9aded. * [VMSS] Install nasm on OSX * [libvpx] bump port version * [libvpx] Add --as=nasm for non-MSVC triplets * [libvpx] Fix nasm debug format flag * Back out nasm change applied in https://github.com/microsoft/vcpkg/pull/15258 Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Long Nguyen <nguyen.long.908132@gmail.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-12-30 07:43:54 +08:00
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
[libvpx] Update to latest and add support for arm64 on macOS (#18183) * [libvpx] Update to latest and add support for arm64 on macOS * [libvpx] x-add-version * [libvpx] Restore patch line endings * [libvpx] x-add-version * Update ports/libvpx/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * [libvpx] x-add-version Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2021-06-11 02:44:46 +08:00
@@ -1370,12 +1370,14 @@ EOF
[libvpx] switch from yasm to nasm (#14545) * [libvpx] switch from yasm to nasm * [vcpkg] install nasm on azure for osx * Revert "[vcpkg] install nasm on azure for osx" This reverts commit f65ad1bdadb7b7b3a3b056186665f102b4f9aded. * [VMSS] Install nasm on OSX * [libvpx] bump port version * [libvpx] Add --as=nasm for non-MSVC triplets * [libvpx] Fix nasm debug format flag * Back out nasm change applied in https://github.com/microsoft/vcpkg/pull/15258 Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Long Nguyen <nguyen.long.908132@gmail.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-12-30 07:43:54 +08:00
case ${tgt_os} in
win32)
add_asflags -f win32
- enabled debug && add_asflags -g cv8
+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
EXE_SFX=.exe
;;
win64)
add_asflags -f win64
- enabled debug && add_asflags -g cv8
+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8
+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8
EXE_SFX=.exe
;;
linux*|solaris*|android*)
Reference in New Issue Copy Permalink