commit: 4ee03110149ff0a37f5d0481a0e4a310d7a9838c Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun Jul 5 00:15:23 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun Jul 5 00:18:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee03110
media-libs/libtgvoip: fix non-posix configure test Bug: https://bugs.gentoo.org/729034 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> .../libtgvoip/files/configure-bashisms.patch | 83 ++++++++++++++++++++++ ....ebuild => libtgvoip-2.4.4_p20200701-r1.ebuild} | 2 + 2 files changed, 85 insertions(+) diff --git a/media-libs/libtgvoip/files/configure-bashisms.patch b/media-libs/libtgvoip/files/configure-bashisms.patch new file mode 100644 index 00000000000..2ebdf8a2799 --- /dev/null +++ b/media-libs/libtgvoip/files/configure-bashisms.patch @@ -0,0 +1,83 @@ +From 601c2b7e4336357f49ad2dcf93bc59e5944975a4 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakov...@gentoo.org> +Date: Sat, 4 Jul 2020 17:11:24 -0700 +Subject: [PATCH] configure.ac: use POSIX test syntax + +with == syntax configure fails on some shells (dash fish) + +./configure: 17913: test: xyes: unexpected operator +./configure: 17921: test: x: unexpected operator +./configure: 17929: test: x: unexpected operator +Detected OS: linux-gnu +./configure: 17946: test: x: unexpected operator +./configure: 17962: test: xno: unexpected operator +checking for dlopen in -ldl... yes +./configure: 18036: test: xyes: unexpected operator +checking for libpulse... yes +checking for alsa... yes +./configure: 18251: test: xyes: unexpected operator +./configure: 18259: test: xyes: unexpected operator +./configure: 18275: test: xyes: unexpected operator +checking for size_t... yes + +Downstream-bug: https://bugs.gentoo.org/729034 +Signed-off-by: Georgy Yakovlev <gyakov...@gentoo.org> +--- + configure.ac | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 37ee7a1..17789c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,18 +46,18 @@ AS_CASE([$host_cpu], + [armv7*], [cpu_armv7=yes] + ) + AS_ECHO("Detected CPU: $host_cpu") +-AM_CONDITIONAL(TARGET_CPU_X86, test "x$cpu_x86" == xyes) +-AM_CONDITIONAL(TARGET_CPU_ARM, test "x$cpu_arm" == xyes) +-AM_CONDITIONAL(TARGET_CPU_ARMV7, test "x$cpu_armv7" == xyes) ++AM_CONDITIONAL(TARGET_CPU_X86, test "x$cpu_x86" = xyes) ++AM_CONDITIONAL(TARGET_CPU_ARM, test "x$cpu_arm" = xyes) ++AM_CONDITIONAL(TARGET_CPU_ARMV7, test "x$cpu_armv7" = xyes) + AS_ECHO("Detected OS: $host_os") + + AS_CASE([$host_os], + [darwin*], [os_osx=yes] + ) +-AM_CONDITIONAL(TARGET_OS_OSX, test "x$os_osx" == xyes) ++AM_CONDITIONAL(TARGET_OS_OSX, test "x$os_osx" = xyes) + + AC_ARG_ENABLE([audio-callback], [AS_HELP_STRING([--enable-audio-callback], [enable callback-based audio I/O])], [], [enable_audio_callback=no]) +-AM_CONDITIONAL(ENABLE_AUDIO_CALLBACK, test "x$enable_audio_callback" == xyes) ++AM_CONDITIONAL(ENABLE_AUDIO_CALLBACK, test "x$enable_audio_callback" = xyes) + + AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # Linux + AC_CHECK_LIB([dl], [dlopen]) +@@ -65,7 +65,7 @@ AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # L + AC_ARG_WITH([pulse], [AS_HELP_STRING([--without-pulse], [disable PulseAudio support])], [], [with_pulse=yes]) + AC_ARG_WITH([alsa], [AS_HELP_STRING([--without-alsa], [disable ALSA support])], [], [with_alsa=yes]) + +- AS_IF([test "x$with_pulse" == xno && test "x$with_alsa" == xno], [ ++ AS_IF([test "x$with_pulse" = xno && test "x$with_alsa" = xno], [ + AC_MSG_FAILURE([You can only disable either ALSA or PulseAudio, not both]); + ]) + +@@ -82,11 +82,11 @@ AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # L + ]) + ]); + +-AM_CONDITIONAL(WITH_PULSE, test "x$with_pulse" == xyes) +-AM_CONDITIONAL(WITH_ALSA, test "x$with_alsa" == xyes) ++AM_CONDITIONAL(WITH_PULSE, test "x$with_pulse" = xyes) ++AM_CONDITIONAL(WITH_ALSA, test "x$with_alsa" = xyes) + + AC_ARG_ENABLE([dsp], [AS_HELP_STRING([--disable-dsp], [disable signal processing (echo cancellation, noise suppression, and automatic gain control)])], [], [enable_dsp=yes]) +-AM_CONDITIONAL(ENABLE_DSP, test "x$enable_dsp" == xyes) ++AM_CONDITIONAL(ENABLE_DSP, test "x$enable_dsp" = xyes) + + # Checks for header files. + AC_FUNC_ALLOCA +-- +2.27.0 + diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701-r1.ebuild similarity index 95% rename from media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild rename to media-libs/libtgvoip/libtgvoip-2.4.4_p20200701-r1.ebuild index 65f68701687..0271d86572a 100644 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701.ebuild +++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200701-r1.ebuild @@ -30,6 +30,8 @@ REQUIRED_USE="|| ( alsa pulseaudio )" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" +PATCHES=( "${FILESDIR}/configure-bashisms.patch" ) + src_prepare() { default sed -i 's/-std=gnu++0x/-std=gnu++17/' Makefile.am || die
