From ba0558e8a5148cdc480cc5432115683d44031656 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 30 Jul 2020 16:41:16 -0700 Subject: [PATCH] pulseaudio: fix compilation with ICONV_FULL Reordered check to check external iconv first. Signed-off-by: Rosen Penev (cherry picked from commit 67f8f57d06ab8776ad58371bb2a3be5cc995fcd6) --- sound/pulseaudio/Makefile | 4 ++-- sound/pulseaudio/patches/010-iconv.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 sound/pulseaudio/patches/010-iconv.patch diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index 6a7ec3c522..a79f2a00c0 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pulseaudio PKG_VERSION:=13.0 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://freedesktop.org/software/pulseaudio/releases @@ -143,7 +143,7 @@ MESON_ARGS += \ -Ddbus=disabled endif -TARGET_LDFLAGS += -Wl,--gc-sections -liconv +TARGET_LDFLAGS += -Wl,--gc-sections $(if $(INTL_FULL),-lintl) define Build/Prepare $(call Build/Prepare/Default) diff --git a/sound/pulseaudio/patches/010-iconv.patch b/sound/pulseaudio/patches/010-iconv.patch new file mode 100644 index 0000000000..c98a24d5bb --- /dev/null +++ b/sound/pulseaudio/patches/010-iconv.patch @@ -0,0 +1,18 @@ +--- a/meson.build ++++ b/meson.build +@@ -380,12 +380,11 @@ if dl_dep.found() + endif + + have_iconv = false +-if cc.has_function('iconv_open') ++iconv_dep = cc.find_library('iconv', required : false) ++have_iconv = iconv_dep.found() ++if not have_iconv and cc.has_function('iconv_open') + iconv_dep = dependency('', required : false) + have_iconv = true +-else +- iconv_dep = cc.find_library('iconv', required : false) +- have_iconv = iconv_dep.found() + endif + if have_iconv + cdata.set('HAVE_ICONV', 1) -- 2.30.2