Fix build failure due to a macro clashing with system headers

universal-ctags defines an __unused__ macro that clashes with functions
using __attribute__((__unused__).  A bunch of such functions were
introduced recently as part of the uselocale work from schwarze@.

Bulk-rename the offending macro and another one similarly named to
something more reasonable, just like in devel/ectags.

Comment suggested by schwarze@, ok schwarze@ sthen@ rsadowski@ (maintainer)
This commit is contained in:
jca 2017-09-11 06:31:44 +00:00
parent 23e036bd6b
commit c1ae0ace07

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/04/12 20:00:30 rsadowski Exp $
# $OpenBSD: Makefile,v 1.2 2017/09/11 06:31:44 jca Exp $
COMMENT = multilanguage reimplementation of the Unix ctags utility
@ -51,6 +51,13 @@ LIB_DEPENDS+= converters/libiconv
WANTLIB+= iconv
.endif
# Application software must not redefine macros in the
# implementation namespace. For example, redefining __unused__
# blows up in our <ctype.h>.
post-extract:
find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \
's/__unused__/uct_unused/g; s/__printf__/uct_printf/g' {} +
pre-configure:
cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh