diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2015-04-11 10:44:37 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2015-04-11 10:44:37 +0000 |
| commit | c1f39772f5e187957bc988c300b0513eae8a7f78 (patch) | |
| tree | 1d8b48975e087d13dccaff795f0bbd268b5e02e1 /devel | |
| parent | 293d0f7728fec9a54a7514452181af2d22af0348 (diff) | |
| download | pkgsrc-c1f39772f5e187957bc988c300b0513eae8a7f78.tar.gz | |
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?
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gettext-lib/Makefile | 9 | ||||
| -rw-r--r-- | devel/gettext-lib/distinfo | 3 | ||||
| -rw-r--r-- | devel/gettext-lib/patches/patch-gettext-runtime_configure.ac | 17 |
3 files changed, 26 insertions, 3 deletions
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index 3dfc5dfedc8..0b8b4fbbdd4 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2014/10/09 13:44:36 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2015/04/11 10:44:37 bsiegert Exp $ .include "../../devel/gettext/Makefile.common" @@ -8,8 +8,10 @@ COMMENT= Internationalized Message Handling Library (libintl) USE_LANGUAGES= c CONFIGURE_ARGS+= --with-included-gettext CONFIGURE_ARGS+= --disable-csharp +CONFIGURE_ARGS+= --disable-c++ CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +USE_TOOLS+= autoconf CFLAGS+= ${CFLAGS.${ICONV_TYPE}-iconv} CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV @@ -17,7 +19,7 @@ CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR} INSTALL_MAKE_FLAGS+= includedir=${PREFIX}/include/gettext -CONFIGURE_DIRS= gettext-runtime +#CONFIGURE_DIRS= gettext-runtime BUILD_DIRS= gettext-runtime/intl EGDIR= ${PREFIX}/share/examples/gettext LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale @@ -25,5 +27,8 @@ LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale REQD_DIRS+= ${LOCALEDIR} REQD_FILES+= ${EGDIR}/locale.alias ${LOCALEDIR}/locale.alias +post-patch: + cd ${WRKSRC}/gettext-runtime && autoconf + .include "../../converters/libiconv/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo index f798d5a6ebc..a9e88c4044c 100644 --- a/devel/gettext-lib/distinfo +++ b/devel/gettext-lib/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.27 2015/01/03 18:04:06 spz Exp $ +$NetBSD: distinfo,v 1.28 2015/04/11 10:44:37 bsiegert Exp $ SHA1 (gettext-0.19.4.tar.gz) = c473f4f268501d971b913197fb07767e628644bb RMD160 (gettext-0.19.4.tar.gz) = ab9191c0ac33c11ee98278271defe7cecc5a567f Size (gettext-0.19.4.tar.gz) = 17717034 bytes SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 SHA1 (patch-ab) = bb975a36b3fe9e4411703caaf455e7eef530a0a7 +SHA1 (patch-gettext-runtime_configure.ac) = fb2bd507611ab8c7dcf62a7767fb192387fbb275 diff --git a/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac b/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac new file mode 100644 index 00000000000..fe429b56318 --- /dev/null +++ b/devel/gettext-lib/patches/patch-gettext-runtime_configure.ac @@ -0,0 +1,17 @@ +$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]) + |