Date: Wed, 2 Sep 2015 10:10:07 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395828 - in head/biology/babel: . files Message-ID: <201509021010.t82AA7nd033985@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Sep 2 10:10:06 2015 New Revision: 395828 URL: https://svnweb.freebsd.org/changeset/ports/395828 Log: Unbreak the build on PowerPC (at least) by always using va_copy() macro for copying variable argument lists, not just on AMD64. Modified: head/biology/babel/Makefile head/biology/babel/files/patch-block.c Modified: head/biology/babel/Makefile ============================================================================== --- head/biology/babel/Makefile Wed Sep 2 09:54:52 2015 (r395827) +++ head/biology/babel/Makefile Wed Sep 2 10:10:06 2015 (r395828) @@ -16,14 +16,12 @@ CONFLICTS_INSTALL= openbabel-* USES= tar:Z MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" -PLIST_FILES+= bin/babel libexec/babel +PLIST_FILES= bin/babel libexec/babel PORTDATA= element.lis new.lis quanta.lis types.lis PORTDOCS= README.1ST OPTIONS_DEFINE= DOCS -BROKEN_powerpc= Does not compile on powerpc - post-build: ${SED} -e 's%@PREFIX@%${PREFIX}%g' \ ${FILESDIR}/babel.sh >${WRKSRC}/babel.sh Modified: head/biology/babel/files/patch-block.c ============================================================================== --- head/biology/babel/files/patch-block.c Wed Sep 2 09:54:52 2015 (r395827) +++ head/biology/babel/files/patch-block.c Wed Sep 2 10:10:06 2015 (r395828) @@ -1,39 +1,28 @@ --- block.c.orig Tue Jan 21 16:52:32 1997 +++ block.c Sun Feb 1 22:56:41 2004 -@@ -7,6 +7,10 @@ +@@ -7,6 +7,7 @@ */ #include "bbltyp.h" -+#include <osreldate.h> -+#if __FreeBSD_version > 500000 +#include <stdarg.h> -+#endif /* the routine that does all the work */ static int block__doalloc(int, block_ptr *, const char *, va_list); -@@ -99,7 +103,11 @@ +@@ -99,7 +100,7 @@ block__doalloc(int clear, block_ptr *han void *array; /* calc how much space we are gonna need */ -+ #if __FreeBSD_version > 500000 && defined(__amd64__) +- ap = initap; + va_copy(ap, initap); -+ #else - ap = initap; -+ #endif size = 0; for(i=0; types[i] != '\0'; i++) { -@@ -115,8 +123,12 @@ - +@@ -116,7 +117,7 @@ block__doalloc(int clear, block_ptr *han /* set up the ptrs if we can alloc the memory */ if(*handle != NULL) -- { -+ { -+ #if __FreeBSD_version > 500000 && defined(__amd64__) + { +- ap = initap; + va_copy(ap, initap); -+ #else - ap = initap; -+ #endif ptr = 0; for(i=0; types[i] != '\0'; i++) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509021010.t82AA7nd033985>