Sat Apr 11 10:44:37 2015 UTC ()
Fix gettext build in the absence of a C++ compiler, such as on MirBSD-current.
Bug submitted upstream as
http://savannah.gnu.org/bugs/index.php?44808.

Why was this not caught by USE_LANGUAGES=c?


(bsiegert)
diff -r1.55 -r1.56 pkgsrc/devel/gettext-lib/Makefile
diff -r1.27 -r1.28 pkgsrc/devel/gettext-lib/distinfo
diff -r0 -r1.1 pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac
cvs diff -r1.55 -r1.56 pkgsrc/devel/gettext-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/Makefile 2014/10/09 13:44:36 1.55
+++ pkgsrc/devel/gettext-lib/Makefile 2015/04/11 10:44:37 1.56
@@ -1,29 +1,34 @@ @@ -1,29 +1,34 @@
1# $NetBSD: Makefile,v 1.55 2014/10/09 13:44:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.56 2015/04/11 10:44:37 bsiegert Exp $
2 2
3.include "../../devel/gettext/Makefile.common" 3.include "../../devel/gettext/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-lib-/} 5PKGNAME= ${DISTNAME:S/-/-lib-/}
6COMMENT= Internationalized Message Handling Library (libintl) 6COMMENT= Internationalized Message Handling Library (libintl)
7 7
8USE_LANGUAGES= c 8USE_LANGUAGES= c
9CONFIGURE_ARGS+= --with-included-gettext 9CONFIGURE_ARGS+= --with-included-gettext
10CONFIGURE_ARGS+= --disable-csharp 10CONFIGURE_ARGS+= --disable-csharp
 11CONFIGURE_ARGS+= --disable-c++
11CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 12CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
12MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 13MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
 14USE_TOOLS+= autoconf
13 15
14CFLAGS+= ${CFLAGS.${ICONV_TYPE}-iconv} 16CFLAGS+= ${CFLAGS.${ICONV_TYPE}-iconv}
15CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV 17CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV
16 18
17INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR} 19INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR}
18INSTALL_MAKE_FLAGS+= includedir=${PREFIX}/include/gettext 20INSTALL_MAKE_FLAGS+= includedir=${PREFIX}/include/gettext
19 21
20CONFIGURE_DIRS= gettext-runtime 22#CONFIGURE_DIRS= gettext-runtime
21BUILD_DIRS= gettext-runtime/intl 23BUILD_DIRS= gettext-runtime/intl
22EGDIR= ${PREFIX}/share/examples/gettext 24EGDIR= ${PREFIX}/share/examples/gettext
23LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale 25LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale
24 26
25REQD_DIRS+= ${LOCALEDIR} 27REQD_DIRS+= ${LOCALEDIR}
26REQD_FILES+= ${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias 28REQD_FILES+= ${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias
27 29
 30post-patch:
 31 cd ${WRKSRC}/gettext-runtime && autoconf
 32
28.include "../../converters/libiconv/buildlink3.mk" 33.include "../../converters/libiconv/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/devel/gettext-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gettext-lib/distinfo 2015/01/03 18:04:06 1.27
+++ pkgsrc/devel/gettext-lib/distinfo 2015/04/11 10:44:37 1.28
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.27 2015/01/03 18:04:06 spz Exp $ 1$NetBSD: distinfo,v 1.28 2015/04/11 10:44:37 bsiegert Exp $
2 2
3SHA1 (gettext-0.19.4.tar.gz) = c473f4f268501d971b913197fb07767e628644bb 3SHA1 (gettext-0.19.4.tar.gz) = c473f4f268501d971b913197fb07767e628644bb
4RMD160 (gettext-0.19.4.tar.gz) = ab9191c0ac33c11ee98278271defe7cecc5a567f 4RMD160 (gettext-0.19.4.tar.gz) = ab9191c0ac33c11ee98278271defe7cecc5a567f
5Size (gettext-0.19.4.tar.gz) = 17717034 bytes 5Size (gettext-0.19.4.tar.gz) = 17717034 bytes
6SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 6SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7
7SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7 7SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7
 8SHA1 (patch-gettext-runtime_configure.ac) = fb2bd507611ab8c7dcf62a7767fb192387fbb275
File Added: pkgsrc/devel/gettext-lib/patches/Attic/patch-gettext-runtime_configure.ac
$NetBSD: patch-gettext-runtime_configure.ac,v 1.1 2015/04/11 10:44:37 bsiegert Exp $

Only run libasprintf configure when its build has been selected.
http://savannah.gnu.org/bugs/index.php?44808

--- gettext-runtime/configure.ac.orig	Fri Apr 10 19:47:35 2015
+++ gettext-runtime/configure.ac
@@ -172,7 +172,9 @@ if test "$CXX" = "no"; then
 fi
 AM_CONDITIONAL([ENABLE_LIBASPRINTF], [test -n "$SUBDIR_libasprintf"])
 
+if [ -n "$SUBDIR_libasprintf" ]; then
 AC_CONFIG_SUBDIRS([libasprintf])
+fi
 
 AC_CONFIG_FILES([Makefile])