From owner-svn-ports-head@freebsd.org Thu Apr 5 02:43:08 2018 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 B867AF8CBD3; Thu, 5 Apr 2018 02:43:08 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E73A81E17; Thu, 5 Apr 2018 02:43:08 +0000 (UTC) (envelope-from emaste@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 696461C8FE; Thu, 5 Apr 2018 02:43:08 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w352h8Fd009849; Thu, 5 Apr 2018 02:43:08 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w352h8JT009846; Thu, 5 Apr 2018 02:43:08 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201804050243.w352h8JT009846@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 5 Apr 2018 02:43:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466522 - in head/print/openprinting: . files X-SVN-Group: ports-head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/print/openprinting: . files X-SVN-Commit-Revision: 466522 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 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: Thu, 05 Apr 2018 02:43:09 -0000 Author: emaste (src committer) Date: Thu Apr 5 02:43:07 2018 New Revision: 466522 URL: https://svnweb.freebsd.org/changeset/ports/466522 Log: print/openprinting: fix build when lld is the system linker This port passes an invalid argument -Mmapfile to the linker. Per GNU BFD ld's manpage, link map options are -M or --print-map to print a link map to stdout, or -Map mapfile to print a link map to mapfile. It appears that ld.bfd accepts -Mmapfile as a synonym for -M due to some quirk of its parser; lld simply fails with an unknown argument error. This port's embedded copy of libtool was also too old to know that it should pass the -fuse-ld flag from LDFLAGS through to the linker, and also too old to match the sed expression in Mk/Uses/libtool.mk that patches in knowledge of -fuse-ld. Thus, patch ltmain.sh to add -fuse-ld=bfd as a passthrough flag. I do not know why libtool's authors believed that silently dropping flags from a user's provided LDFLAGS was (is) a sensible thing to do. PR: 221809 Approved by: ler Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D14968 Added: head/print/openprinting/files/patch-ltmain.sh (contents, props changed) Modified: head/print/openprinting/Makefile Modified: head/print/openprinting/Makefile ============================================================================== --- head/print/openprinting/Makefile Thu Apr 5 02:37:22 2018 (r466521) +++ head/print/openprinting/Makefile Thu Apr 5 02:43:07 2018 (r466522) @@ -19,6 +19,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip MAKE_JOBS_UNSAFE= yes +LLD_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lintl Added: head/print/openprinting/files/patch-ltmain.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/openprinting/files/patch-ltmain.sh Thu Apr 5 02:43:07 2018 (r466522) @@ -0,0 +1,14 @@ +--- ltmain.sh.orig 2018-04-04 21:26:22.534684000 -0400 ++++ ltmain.sh 2018-04-04 21:26:32.219631000 -0400 +@@ -1288,6 +1288,11 @@ + continue + ;; + ++ -fuse-ld=*) ++ compiler_flags="$compiler_flags $qarg" ++ continue ++ ;; ++ + -inst-prefix-dir) + prev=inst_prefix + continue