cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix libintl detection. The old AM_GNU_GETTEXT macro doesn't work with

Browse Source 
C++ on LP64 archs, so use code snippet from a later version.
Debugged by nigel@
This commit is contained in:
naddy 2014-01-21 21:33:15 +00:00
parent 8d419e40bb
commit 634f92e151
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/doc++/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2014/01/20 17:06:31 edd Exp $
# $OpenBSD: Makefile,v 1.22 2014/01/21 21:33:15 naddy Exp $
COMMENT= documentation system for C, C++, IDL and Java
@ -30,8 +30,5 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/texmf-local/tex/latex/doc++
${INSTALL_DATA} ${WRKSRC}/doc/*.sty \
${PREFIX}/share/texmf-local/tex/latex/doc++
# Remove stuff that collides with gettext and libiconv
rm ${PREFIX}/share/locale/locale.alias
rm ${PREFIX}/lib/charset.alias
.include <bsd.port.mk>

10
devel/doc++/patches/patch-configure
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2005/02/13 16:40:59 alek Exp $
--- configure.orig Sun Feb 13 17:21:26 2005
+++ configure Sun Feb 13 17:24:35 2005
$OpenBSD: patch-configure,v 1.2 2014/01/21 21:33:15 naddy Exp $
--- configure.orig Sun Dec 22 16:39:27 2002
+++ configure Tue Jan 21 22:18:39 2014
@@ -7930,7 +7930,7 @@ int
main ()
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ()
+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ()
;
return 0;
}
@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.1 2005/02/13 16:40:59 alek Exp $
{
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ()
+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ()
;
return 0;
}