Link with LTLIBINTL instead of LTLIBICON since this uses

libintl_bindtextdomain.

prodded by espie@
This commit is contained in:
ajacoutot 2018-11-17 11:55:01 +00:00
parent b045a53d27
commit 0570c9b503
2 changed files with 10 additions and 12 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.95 2018/07/17 07:38:38 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.96 2018/11/17 11:55:01 ajacoutot Exp $
# XXX
# sndio: what to do with (channel) map
@ -12,6 +12,7 @@ COMMENT= cross-platform networked sound server
VERSION= 12.2
DISTNAME= pulseaudio-${VERSION}
EXTRACT_SUFX= .tar.xz
REVISION= 0
SHARED_LIBS += pulse 7.0 # .20.3
SHARED_LIBS += pulse-simple 1.1 # .1.1
@ -121,15 +122,9 @@ BUILD_DEPENDS += devel/libtool # needs libtoolize
post-extract:
cp ${FILESDIR}/module-sndio*.{c,h} ${WRKSRC}/src/modules/
pre-configure:
cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i --force && \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
aclocal && \
intltoolize --force
do-gen:
cd ${WRKSRC} && ${SETENV} ${AUTOCONF_ENV} autoreconf -i --force && \
${SETENV} ${AUTOCONF_ENV} aclocal && intltoolize --force
### END SNDIO ###
sed -i 's,/bin/bash,/usr/bin/env bash,' \
${WRKSRC}/shell-completion/bash/pulseaudio

View File

@ -1,4 +1,7 @@
$OpenBSD: patch-src_Makefile_am,v 1.15 2018/06/21 15:23:40 ajacoutot Exp $
$OpenBSD: patch-src_Makefile_am,v 1.16 2018/11/17 11:55:01 ajacoutot Exp $
libpulsecommon-12.2.so: undefined symbol 'libintl_bindtextdomain'
Index: src/Makefile.am
--- src/Makefile.am.orig
+++ src/Makefile.am
@ -7,7 +10,7 @@ Index: src/Makefile.am
libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS)
libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) $(AM_LIBLDFLAGS) -avoid-version
-libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS)
+libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(LIBSNDFILE_LIBS) -lexecinfo
+libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBINTL) $(LIBSNDFILE_LIBS) -lexecinfo
if HAVE_MEMFD
libpulsecommon_@PA_MAJORMINOR@_la_SOURCES += \