Date: Mon, 15 Jan 2018 10:01:19 +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: r459026 - in head/textproc/teckit: . files Message-ID: <201801151001.w0FA1J7s072446@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Jan 15 10:01:19 2018 New Revision: 459026 URL: https://svnweb.freebsd.org/changeset/ports/459026 Log: Unbreak with pre-C++11 compilers, e.g. with gcc 4.2.1 which is still the default compiler on some tier-2 architectures like powerpc and sparc64, by using identical types from C's <stdint.h> rather than C++'s <cstdint> header file. While here, convert to USES+=localbase. PR: 225171 Reported by: jhibbits Added: head/textproc/teckit/files/patch-SFconv_UtfCodec.h (contents, props changed) Modified: head/textproc/teckit/Makefile Modified: head/textproc/teckit/Makefile ============================================================================== --- head/textproc/teckit/Makefile Mon Jan 15 09:20:15 2018 (r459025) +++ head/textproc/teckit/Makefile Mon Jan 15 10:01:19 2018 (r459026) @@ -14,21 +14,23 @@ LICENSE_FILE= ${WRKSRC}/license/LICENSING.txt LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= autoreconf libtool pkgconfig +USES= autoreconf libtool localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= silnrsi GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip DOCS= AUTHORS README NEWS docs/*.pdf license/LICENSING.txt OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e '/sfconv_CXXFLAGS = -std=c++11/d' \ + ${WRKSRC}/bin/Makefile.am + post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Added: head/textproc/teckit/files/patch-SFconv_UtfCodec.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/teckit/files/patch-SFconv_UtfCodec.h Mon Jan 15 10:01:19 2018 (r459026) @@ -0,0 +1,15 @@ +--- SFconv/UtfCodec.h.orig 2017-06-23 19:39:26 UTC ++++ SFconv/UtfCodec.h +@@ -28,11 +28,7 @@ of the License or (at your option) any l + + #include <cstddef> + #include <cstdlib> +-#include <cstdint> +- +-using std::int8_t; +-using std::uint8_t; +-using std::ptrdiff_t; ++#include <stdint.h> + + typedef uint32_t uchar_t; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801151001.w0FA1J7s072446>