commit: e66f190c46afda2894b841d8e0f11fefe2ce8f24 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Thu May 14 14:10:29 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Thu May 14 14:11:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66f190c
media-libs/libprojectm: Remove bashisms Closes: https://bugs.gentoo.org/show_bug.cgi?id=714098 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> .../files/libprojectm-3.1.3-bashisms.patch | 47 ++++++++++++++++++++++ media-libs/libprojectm/libprojectm-3.1.3.ebuild | 4 ++ 2 files changed, 51 insertions(+) diff --git a/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch new file mode 100644 index 00000000000..8d84ece802c --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-3.1.3-bashisms.patch @@ -0,0 +1,47 @@ +From 8a522d975890a4512be0f04285f356c6db653a57 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Thu, 14 May 2020 11:46:50 +0200 +Subject: [PATCH] configure.ac: Avoid bashisms + +or else we end up like this: + + ./configure: 18902: ./configure: Syntax error: redirection unexpected + +or + + ./configure: 20152: ./configure: my_CFLAGS+=-DDATADIR_PATH=\""$(pkgdatadir)"\" : not found + ./configure: 20153: ./configure: my_CFLAGS+=-I$(top_srcdir)/vendor : not found + +Gentoo-bug: https://bugs.gentoo.org/714098 +Signed-off-by: Lars Wendler <[email protected]> +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5fa53eca5..ecf85e076 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -163,7 +163,7 @@ AC_PREFIX_DEFAULT([/usr/local]) + + AC_PROG_MKDIR_P + +-AS_IF([grep android <<< ${host}], [], ++AS_IF([echo ${host} | grep -Fq android], [], + [AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [ + CXXFLAGS="$CXXFLAGS -stdlib=libc++"]) + ]) +@@ -237,10 +237,10 @@ AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"]) + AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes"]) + + +-my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits " ++my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits" + #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer " +-my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" ' +-my_CFLAGS+='-I$(top_srcdir)/vendor ' ++my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\"" ++my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor" + AC_SUBST([my_CFLAGS]) + + diff --git a/media-libs/libprojectm/libprojectm-3.1.3.ebuild b/media-libs/libprojectm/libprojectm-3.1.3.ebuild index 1dc01b43566..8a83145eb81 100644 --- a/media-libs/libprojectm/libprojectm-3.1.3.ebuild +++ b/media-libs/libprojectm/libprojectm-3.1.3.ebuild @@ -22,6 +22,10 @@ LICENSE="LGPL-2" SLOT="0/2" IUSE="gles2 jack qt5 sdl" +PATCHES=( + "${FILESDIR}/${P}-bashisms.patch" +) + RDEPEND="gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)]
