<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/19bb892e8606b6a0f5d086723ea774bf202d9ca2">https://github.com/macports/macports-ports/commit/19bb892e8606b6a0f5d086723ea774bf202d9ca2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 19bb892 libvpx: specify --force-target
</span>19bb892 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 19bb892e8606b6a0f5d086723ea774bf202d9ca2
</span>Author: wwcv <212228+johannkoenig@users.noreply.github.com>
AuthorDate: Wed Oct 23 15:35:14 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> libvpx: specify --force-target
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Macports uses <arch>-darwin-gcc for the target and libvpx
</span><span style='display:block; white-space:pre;color:#404040;'> expects -darwinNN- (where NN is 8-18, referring to the
</span><span style='display:block; white-space:pre;color:#404040;'> MacOS version)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead of patching 'configure' with these additional targets
</span><span style='display:block; white-space:pre;color:#404040;'> use --force-target to skip validation. This will remove the
</span><span style='display:block; white-space:pre;color:#404040;'> need for libvpx/files/patch-configure.diff
</span>---
multimedia/libvpx/Portfile | 5 ++---
multimedia/libvpx/files/patch-configure.diff | 18 ------------------
2 files changed, 2 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/Portfile b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96ac38d..df1aca4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/libvpx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,6 @@ supported_archs x86_64 i386
</span> depends_build-append port:yasm
patchfiles patch-build-make-configure.sh.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span> patch-Makefile.diff
# clang 425.0.28 with libvpx-1.4.0:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,14 +111,14 @@ set my_targets(x86_64) x86_64
</span> foreach my_arch {i386 x86_64} {
set merger_host(${my_arch}) ""
if {[info exists my_targets(${my_arch})]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_configure_args(${my_arch}) --target=$my_targets(${my_arch})-${os.platform}-gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merger_configure_args(${my_arch}) --force-target=$my_targets(${my_arch})-${os.platform}-gcc
</span> }
}
if {![variant_isset universal]} {
if {[info exists merger_configure_args(${build_arch})]} {
configure.args-append $merger_configure_args(${build_arch})
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --target=${os.arch}-${os.platform}-gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --force-target=${os.arch}-${os.platform}-gcc
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/libvpx/files/patch-configure.diff b/multimedia/libvpx/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a168b10..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/libvpx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-02-06 19:44:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-02-08 07:00:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,6 +117,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} ppc64le-linux-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} sparc-solaris-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-android-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all_platforms="${all_platforms} x86-darwin-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-darwin8-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-darwin8-icc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-darwin9-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,6 +139,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-win32-vs14"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86-win32-vs15"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-android-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all_platforms="${all_platforms} x86_64-darwin-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-darwin9-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-darwin10-gcc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_platforms="${all_platforms} x86_64-darwin11-gcc"
</span></pre><pre style='margin:0'>
</pre>