From owner-svn-ports-all@FreeBSD.ORG Sun Apr 12 05:20:01 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2CBEFB31; Sun, 12 Apr 2015 05:20:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 17240A54; Sun, 12 Apr 2015 05:20:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3C5K0Jo063326; Sun, 12 Apr 2015 05:20:00 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3C5K0Jv063321; Sun, 12 Apr 2015 05:20:00 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201504120520.t3C5K0Jv063321@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Sun, 12 Apr 2015 05:20:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383837 - in head/deskutils/gnote: . files 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.18-1 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: Sun, 12 Apr 2015 05:20:01 -0000 Author: truckman Date: Sun Apr 12 05:19:59 2015 New Revision: 383837 URL: https://svnweb.freebsd.org/changeset/ports/383837 Log: Configure fails to find proper link command for Boost unit_test_framework because it first tries to link this library statically, and when that fails, it "forgets" to try linking it dynamically. The reason is that it has a bunch of nested loops to try multiple variations on the library name and keeps track of which library names it has tried so that it doesn't retry the same library name. The problem is that one of the loop variables also governs whether it should try static or dynamic liking, and if static linking fails, the library name gets added to the exclusion list, which prevents it from trying dynamic linking. Fix by the value of the loop variable $boost_rtopt_ to the key value into the list of library variations to disambiguate the two cases so that linking both ways is tried. Also move the location where $boost_failed_libs is set out by one nesting level to prevent the same library name value from being added to the list multiple times. Get rid of .include and .if ${PORT_OPTIONS:MDOCS} as suggested by mat@. Portlint whines about it but the Porters Handbook says it is OK because the doc files are few and small. Unmute ${INSTALL_DATA} as suggested by portlint. PR: 195597 Differential Revision: https://reviews.freebsd.org/D2279 Reviewed by: kwm Approved by: mat (mentor) Added: head/deskutils/gnote/files/patch-configure (contents, props changed) Modified: head/deskutils/gnote/Makefile Modified: head/deskutils/gnote/Makefile ============================================================================== --- head/deskutils/gnote/Makefile Sun Apr 12 01:20:44 2015 (r383836) +++ head/deskutils/gnote/Makefile Sun Apr 12 05:19:59 2015 (r383837) @@ -36,20 +36,12 @@ GLIB_SCHEMAS= org.gnome.gnote.gschema.xm DOCS= AUTHORS ChangeLog NEWS README TODO -.include - -.if ${OSVERSION} < 900000 -BROKEN= Fails to build -.endif - PLIST_SUB+= VERSION=${PORTVERSION} post-install: -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Added: head/deskutils/gnote/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gnote/files/patch-configure Sun Apr 12 05:19:59 2015 (r383837) @@ -0,0 +1,23 @@ +--- configure.orig 2014-09-26 13:03:19.000000000 -0700 ++++ configure 2014-12-02 16:43:13.000000000 -0800 +@@ -17688,7 +17688,7 @@ + do + # Avoid testing twice the same lib + case $boost_failed_libs in #( +- *@$boost_lib@*) continue;; ++ *@$boost_lib\ $boost_rtopt_@*) continue;; + esac + # If with_boost is empty, we'll search in /lib first, which is not quite + # right so instead we'll try to a location based on where the headers are. +@@ -17822,10 +17822,9 @@ + boost_cv_lib_unit_test_framework_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" + boost_cv_lib_unit_test_framework_LDPATH="$boost_ldpath" + break 6 +- else +- boost_failed_libs="$boost_failed_libs@$boost_lib@" + fi + done ++ boost_failed_libs="$boost_failed_libs@$boost_lib $boost_rtopt_@" + done + done + done