Date: Tue, 8 Mar 2016 12:48:51 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410612 - head/devel/libc++ Message-ID: <201603081248.u28Cmpw6061510@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Mar 8 12:48:51 2016 New Revision: 410612 URL: https://svnweb.freebsd.org/changeset/ports/410612 Log: devel/libc++: specific libcxxrt LIB_DEPENDS conditionally The libcxxrt was unconditionally specified, but pkg(8) would not register it on FreeBSD 10+ because the libcxxrt.so requirement of the specification was satisfied by the base libraries. As a result, Synth would rebuild the libc++ each time becaues there were more dependency requirements in the port Makefile than the resulting package, leading Synth to consider the package obsolete. Since there are already existence tests for setting flags, the solution is trivial: move LIB_DEPENDS definition inside the conditional blocks. The resulting package is the same everywhere, and Synth is happy too. PR: 207756 Submitted by: Andrew Terekhov Discussed with: dim@, bapt@ (no conclusion, I fixed it myself) Modified: head/devel/libc++/Makefile Modified: head/devel/libc++/Makefile ============================================================================== --- head/devel/libc++/Makefile Tue Mar 8 11:20:23 2016 (r410611) +++ head/devel/libc++/Makefile Tue Mar 8 12:48:51 2016 (r410612) @@ -18,22 +18,21 @@ LICENSE_GROUP= MIT UIUC LICENSE_NAME_UIUC= University of Illinois/NCSA Open Source License LICENSE_PERMS_UIUC= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libcxxrt.so:${PORTSDIR}/devel/libcxxrt - USES+= cmake:outsource compiler:c++11-lang USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.options.mk> - .if exists(/usr/lib/libcxxrt.so) CXXRT_INCS= /usr/include/c++/v1/ CXXRT_LIB= /usr/lib/libcxxrt.so .else CXXRT_INCS= ${LOCALBASE}/include/cxxrt/ CXXRT_LIB= ${LOCALBASE}/lib/libcxxrt.so +LIB_DEPENDS+= libcxxrt.so:${PORTSDIR}/devel/libcxxrt .endif +.include <bsd.port.options.mk> + CMAKE_ARGS= -DLIBCXX_CXX_ABI=libcxxrt -DLIBCXX_LIBCXXRT_INCLUDE_PATHS=${CXXRT_INCS} .if !defined(SVN_REV)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603081248.u28Cmpw6061510>