From 4d7b3e61bf407fed796872c2a58d38b04bdae7d7 Mon Sep 17 00:00:00 2001 From: jca Date: Wed, 6 Sep 2017 21:14:16 +0000 Subject: [PATCH] Fix build failure due to a macro crashing with system headers ectags 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. Committing early since ectags is needed by vim-taglist and x11/gnome/builder. Comment suggested by schwarze@, ok schwarze@ sthen@ --- devel/ectags/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devel/ectags/Makefile b/devel/ectags/Makefile index e2a17e13fb1..7f8f7b1144f 100644 --- a/devel/ectags/Makefile +++ b/devel/ectags/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/12/29 14:48:51 shadchin Exp $ +# $OpenBSD: Makefile,v 1.21 2017/09/06 21:14:16 jca Exp $ COMMENT= multilanguage implementation of ctags @@ -20,6 +20,10 @@ CONFIGURE_STYLE=gnu DOCS= FAQ NEWS README EXTENDING.html +post-extract: + find ${WRKSRC} -type f -name '*.[ch]' -exec sed -i \ + 's/__unused__/ect_unused/g; s/__printf__/ect_printf/g' {} + + do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/ctags ${PREFIX}/bin/ectags ${INSTALL_MAN} ${WRKSRC}/ctags.1 ${PREFIX}/man/man1/ectags.1