pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/50814: libvpx 1.5 dropped powerpc configuration
The following reply was made to PR pkg/50814; it has been noted by GNATS.
From: "John D. Baker" <jdbaker%mylinuxisp.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/50814: libvpx 1.5 dropped powerpc configuration
Date: Mon, 13 Mar 2017 18:05:06 -0500 (CDT)
As of libvpx-1.6.1 in pkgsrc-HEAD as of 13 March 2017, the previous
"patch-configure" does not apply cleanly in 'make patch'. It will
apply manually with offset and fuzz warnings.
Below is a new "patch-configure" generated for libvpx-1.6.1:
+--- configure.orig 2017-03-13 17:54:27.000000000 -0500
++++ configure 2017-03-13 17:55:12.000000000 -0500
+@@ -113,6 +113,12 @@ all_platforms="${all_platforms} armv7s-d
+ all_platforms="${all_platforms} armv8-linux-gcc"
+ all_platforms="${all_platforms} mips32-linux-gcc"
+ all_platforms="${all_platforms} mips64-linux-gcc"
++all_platforms="${all_platforms} ppc32-darwin8-gcc"
++all_platforms="${all_platforms} ppc32-darwin9-gcc"
++all_platforms="${all_platforms} ppc32-linux-gcc"
++all_platforms="${all_platforms} ppc64-darwin8-gcc"
++all_platforms="${all_platforms} ppc64-darwin9-gcc"
++all_platforms="${all_platforms} ppc64-linux-gcc"
+ all_platforms="${all_platforms} sparc-linux-gcc"
+ all_platforms="${all_platforms} sparc-solaris-gcc"
+ all_platforms="${all_platforms} x86-android-gcc"
+@@ -153,6 +159,13 @@ all_platforms="${all_platforms} x86_64-w
+ all_platforms="${all_platforms} x86_64-win64-vs11"
+ all_platforms="${all_platforms} x86_64-win64-vs12"
+ all_platforms="${all_platforms} x86_64-win64-vs14"
++all_platforms="${all_platforms} universal-darwin8-gcc"
++all_platforms="${all_platforms} universal-darwin9-gcc"
++all_platforms="${all_platforms} universal-darwin10-gcc"
++all_platforms="${all_platforms} universal-darwin11-gcc"
++all_platforms="${all_platforms} universal-darwin12-gcc"
++all_platforms="${all_platforms} universal-darwin13-gcc"
++all_platforms="${all_platforms} universal-darwin14-gcc"
+ all_platforms="${all_platforms} generic-gnu"
+
+ # all_targets is a list of all targets that can be configured
+@@ -211,6 +224,8 @@ ARCH_LIST="
+ mips
+ x86
+ x86_64
++ ppc32
++ ppc64
+ "
+ ARCH_EXT_LIST_X86="
+ mmx
+@@ -221,6 +236,8 @@ ARCH_EXT_LIST_X86="
+ sse4_1
+ avx
+ avx2
++
++ altivec
+ "
+ ARCH_EXT_LIST="
+ neon
+@@ -406,8 +423,22 @@ post_process_cmdline() {
+
+ process_targets() {
+ enabled child || write_common_config_banner
+- write_common_target_config_h ${BUILD_PFX}vpx_config.h
+- write_common_config_targets
++ enabled universal || write_common_target_config_h ${BUILD_PFX}vpx_config.h
++
++ # For fat binaries, call configure recursively to configure for each
++ # binary architecture to be included.
++ if enabled universal; then
++ # Call configure (ourselves) for each subarchitecture
++ for arch in $fat_bin_archs; do
++ BUILD_PFX=${arch}/ toolchain=${arch} $self --child $cmdline_args || exit $?
++ done
++ fi
++
++ # The write_common_config (config.mk) logic is deferred until after the
++ # recursive calls to configure complete, because we want our universal
++ # targets to be executed last.
++ write_common_config_targets
++ enabled universal && echo "FAT_ARCHS=${fat_bin_archs}" >> config.mk
+
+ # Calculate the default distribution name, based on the enabled features
+ cf=""
+@@ -551,6 +582,30 @@ EOF
+ process_toolchain() {
+ process_common_toolchain
+
++ # Handle universal binaries for this architecture
++ case $toolchain in
++ universal-darwin*)
++ darwin_ver=${tgt_os##darwin}
++
++ # Snow Leopard (10.6/darwin10) dropped support for PPC
++ # Include PPC support for all prior versions
++ if [ $darwin_ver -lt 10 ]; then
++ fat_bin_archs="$fat_bin_archs ppc32-${tgt_os}-gcc"
++ fi
++
++ # Tiger (10.4/darwin8) brought support for x86
++ if [ $darwin_ver -ge 8 ]; then
++ fat_bin_archs="$fat_bin_archs x86-${tgt_os}-${tgt_cc}"
++ fi
++
++ # Leopard (10.5/darwin9) brought 64 bit support
++ if [ $darwin_ver -ge 9 ]; then
++ fat_bin_archs="$fat_bin_archs x86_64-${tgt_os}-${tgt_cc}"
++ fi
++ ;;
++ esac
++
++
+ # Enable some useful compiler flags
+ if enabled gcc; then
+ enabled werror && check_add_cflags -Werror
+@@ -637,7 +692,7 @@ process_toolchain() {
+ esac
+
+ # Other toolchain specific defaults
+- case $toolchain in x86*) soft_enable postproc;; esac
++ case $toolchain in x86*|ppc*|universal*) soft_enable postproc;; esac
+
+ if enabled postproc_visualizer; then
+ enabled postproc || die "postproc_visualizer requires postproc to be enabled"
--
|/"\ John D. Baker, KN5UKS NetBSD Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com OpenBSD FreeBSD
| X No HTML/proprietary data in email. BSD just sits there and works!
|/ \ GPGkeyID: D703 4A7E 479F 63F8 D3F4 BD99 9572 8F23 E4AD 1645
Home |
Main Index |
Thread Index |
Old Index