Date: Sun, 12 Apr 2015 05:20:00 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383837 - in head/deskutils/gnote: . files Message-ID: <201504120520.t3C5K0Jv063321@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> 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 <bsd.port.options.mk> - -.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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504120520.t3C5K0Jv063321>