Date: Sun, 18 Dec 2016 16:42:28 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428878 - head/www/nghttp2 Message-ID: <201612181642.uBIGgShh067009@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Dec 18 16:42:27 2016 New Revision: 428878 URL: https://svnweb.freebsd.org/changeset/ports/428878 Log: - Merge post-configure: PR: 215382 Reported by: Anton Sayetsky <vsasjason@gmail.com> Modified: head/www/nghttp2/Makefile Modified: head/www/nghttp2/Makefile ============================================================================== --- head/www/nghttp2/Makefile Sun Dec 18 16:12:28 2016 (r428877) +++ head/www/nghttp2/Makefile Sun Dec 18 16:42:27 2016 (r428878) @@ -65,13 +65,6 @@ SPDY_LIB_DEPENDS= libspdylay.so:www/spdy CPPFLAGS+= -D_GLIBCXX_USE_C99 .endif -# Disable thread_local support for hosts without __cxa_thread_atexit() -# See PR/192320 for details -.if (${OSVERSION} < 1003506) || ((${OSVERSION} >= 1100000) && (${OSVERSION} < 1100122)) || (${OSVERSION} == 1100500) -post-configure: - @${REINPLACE_CMD} -e '/HAVE_THREAD_LOCAL/d' ${WRKSRC}/config.h -.endif - .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 CONFIGURE_ARGS+=--with-jemalloc .endif @@ -85,6 +78,11 @@ post-configure: @${MKDIR} ${WRKSRC}/lib/.libs/ @${CP} ${LOCALBASE}/lib/libnghttp2.so* ${WRKSRC}/lib/.libs/ @cd ${WRKSRC}/lib/.libs/ && ${AR} x ${LOCALBASE}/lib/libnghttp2.a +# Disable thread_local support for hosts without __cxa_thread_atexit() +# See PR/192320 for details +.if (${OSVERSION} < 1003506) || ((${OSVERSION} >= 1100000) && (${OSVERSION} < 1100122)) || (${OSVERSION} == 1100500) + @${REINPLACE_CMD} -e '/HAVE_THREAD_LOCAL/d' ${WRKSRC}/config.h +.endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612181642.uBIGgShh067009>