From owner-svn-ports-head@freebsd.org Mon Mar 25 13:00:24 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FB041560532; Mon, 25 Mar 2019 13:00:24 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E75626AA15; Mon, 25 Mar 2019 13:00:23 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C410481A0; Mon, 25 Mar 2019 13:00:23 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2PD0NkA009172; Mon, 25 Mar 2019 13:00:23 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2PD0NkY009171; Mon, 25 Mar 2019 13:00:23 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201903251300.x2PD0NkY009171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 25 Mar 2019 13:00:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496820 - head/graphics/ilmbase X-SVN-Group: ports-head X-SVN-Commit-Author: rakuco X-SVN-Commit-Paths: head/graphics/ilmbase X-SVN-Commit-Revision: 496820 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E75626AA15 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Mar 2019 13:00:24 -0000 Author: rakuco Date: Mon Mar 25 13:00:23 2019 New Revision: 496820 URL: https://svnweb.freebsd.org/changeset/ports/496820 Log: Simplify pthread + libtool workaround. Improve upon r496818. Instead of setting both MAKE_ENV and patching ilmthread's Makefile, just make sure PTHREAD_LIBS is set a configuration time. This is what Debian does, and it achieves the same solution with fewer lines. While here, add an explanation for why we need this. PR: 236734 Approved by: mandree (maintainer) Modified: head/graphics/ilmbase/Makefile Modified: head/graphics/ilmbase/Makefile ============================================================================== --- head/graphics/ilmbase/Makefile Mon Mar 25 12:49:25 2019 (r496819) +++ head/graphics/ilmbase/Makefile Mon Mar 25 13:00:23 2019 (r496820) @@ -24,7 +24,10 @@ GNU_CONFIGURE= yes # The configure script uses bash arrays CONFIGURE_SHELL=${BASH_CMD} CONFIGURE_ARGS= --disable-static -MAKE_ARGS+= PTHREAD_LIBS="-pthread -lpthread" +# libtool links C++ libraries with -nostdlib, which prevents -pthread from +# having an effect (at least with clang). Make sure we also pass -lpthread so +# we do link against libthr.so. +CONFIGURE_ENV+= PTHREAD_LIBS="-pthread -lpthread" TEST_TARGET= check PORTDOCS= AUTHORS ChangeLog README.md @@ -48,7 +51,6 @@ regression-test regression check:: test post-configure: ${REINPLACE_CMD} -e 's/#define HAVE_UCONTEXT_H 1/#undef HAVE_UCONTEXT_H/' ${WRKSRC}/config/IlmBaseConfig.h - ${REINPLACE_CMD} -e '/^libIlmThread_la_LIBADD/s/$$/ $$(PTHREAD_LIBS)/' ${WRKSRC}/IlmThread/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libHalf.so.${VER}