From owner-svn-ports-all@freebsd.org Sat Oct 22 07:33:18 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BC88C1C3F5; Sat, 22 Oct 2016 07:33:18 +0000 (UTC) (envelope-from jhale@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 mx1.freebsd.org (Postfix) with ESMTPS id 43495339; Sat, 22 Oct 2016 07:33:18 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9M7XHlb009308; Sat, 22 Oct 2016 07:33:17 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9M7XHEW009306; Sat, 22 Oct 2016 07:33:17 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201610220733.u9M7XHEW009306@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 22 Oct 2016 07:33:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424451 - in head/security: gpgme gpgme-qt5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Oct 2016 07:33:18 -0000 Author: jhale Date: Sat Oct 22 07:33:17 2016 New Revision: 424451 URL: https://svnweb.freebsd.org/changeset/ports/424451 Log: Fix build of the Qt interface on FreeBSD 10.2 and 10.3. On FreeBSD 10.1, it builds without issue (and thats what I originally tested this on and assumed it would work on later releases), but there seems to be a regression in the c++ headers that appears to have happend in r278724, so use libc++ from ports. libtool: compile: c++ -std=c++11 -DHAVE_CONFIG_H -I. -I../../.. -I../../../lang/cpp/src -I../../../src -I/usr/local/include/qt5/QtCore -I/usr/local/include/qt5 -fpic -I/usr/local/include -I/usr/local/include -DBUILDING_QGPGME -isystem /usr/local/include -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing -isystem /usr/local/include -MT qgpgmeencryptjob.lo -MD -MP -MF .deps/qgpgmeencryptjob.Tpo -c qgpgmeencryptjob.cpp -fPIC -DPIC -o .libs/qgpgmeencryptjob.o qgpgmeencryptjob.cpp:133:9: error: no matching function for call to 'bind' run(std::bind(&encrypt, ^~~~~~~~~ /usr/include/c++/v1/functional:2184:1: note: candidate template ignored: couldn't infer template argument '_Fp' bind(_Fp&& __f, _BoundArgs&&... __bound_args) ^ /usr/include/c++/v1/functional:2193:1: note: candidate template ignored: couldn't infer template argument '_Rp' bind(_Fp&& __f, _BoundArgs&&... __bound_args) ^ 1 error generated. gmake[4]: *** [Makefile:801: qgpgmeencryptjob.lo] Error 1 Also, link to libgpgmepp already installed instead of rebuilding it. Modified: head/security/gpgme-qt5/Makefile head/security/gpgme/Makefile Modified: head/security/gpgme-qt5/Makefile ============================================================================== --- head/security/gpgme-qt5/Makefile Sat Oct 22 07:08:45 2016 (r424450) +++ head/security/gpgme-qt5/Makefile Sat Oct 22 07:33:17 2016 (r424451) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -${SLAVEPORT} MAINTAINER= jhale@FreeBSD.org Modified: head/security/gpgme/Makefile ============================================================================== --- head/security/gpgme/Makefile Sat Oct 22 07:08:45 2016 (r424450) +++ head/security/gpgme/Makefile Sat Oct 22 07:33:17 2016 (r424451) @@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --disable-gpgsm-test .if defined(SLAVEPORT) LIB_DEPENDS+= libgpgme.so:security/gpgme -BUILD_WRKSRC= ${WRKSRC}/lang +BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} INSTALL_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} . if ${SLAVEPORT} == "cpp" @@ -77,7 +77,6 @@ BUILD_DEPENDS+= swig3.0:devel/swig30 \ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} USES+= python USE_PYTHON= py3kplist -BUILD_WRKSRC= ${WRKSRC}/lang/${BINDING_NAME} CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0 PLIST_SUB+= VERSION=${PORTVERSION} CONFLICTS_INSTALL= py*-pyme-[0-9]* @@ -87,10 +86,16 @@ CONFLICTS_INSTALL= py*-pyme-[0-9]* .include .if defined(SLAVEPORT) -. if (${SLAVEPORT} == "cpp" || ${SLAVEPORT} == "qt5") +. if ${SLAVEPORT} == "cpp" . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001000 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 +CXXFLAGS+= -stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1 +. endif +. endif +. if ${SLAVEPORT} == "qt5" +. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1001000 || (${OSVERSION} >= 1001507 && ${OSVERSION} < 1100080)) +BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ +CXXFLAGS+= -stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1 . endif . endif . if ${SLAVEPORT} == "python" @@ -106,6 +111,10 @@ post-patch: .if defined(SLAVEPORT) @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|../../../src/libgpgme.la|-lgpgme|g' +. if ${SLAVEPORT} == "qt5" + @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ + ${REINPLACE_CMD} -e 's|../../cpp/src/libgpgmepp.la|-lgpgmepp|g' +. endif .endif @${REINPLACE_CMD} -e 's|^clfilesdir.*|clfilesdir=$$\(libdir\)/common-lisp/gpgme|g' \ ${WRKSRC}/lang/cl/Makefile.in