From owner-svn-ports-head@freebsd.org Sun Dec 22 19:23:51 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BACB41DAB15; Sun, 22 Dec 2019 19:23:51 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47gspv4c12z3FvH; Sun, 22 Dec 2019 19:23:51 +0000 (UTC) (envelope-from pkubaj@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 994014463; Sun, 22 Dec 2019 19:23:51 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBMJNpoi035057; Sun, 22 Dec 2019 19:23:51 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBMJNplf035056; Sun, 22 Dec 2019 19:23:51 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201912221923.xBMJNplf035056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Sun, 22 Dec 2019 19:23:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520653 - head/ports-mgmt/portal X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/ports-mgmt/portal X-SVN-Commit-Revision: 520653 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.29 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: Sun, 22 Dec 2019 19:23:51 -0000 Author: pkubaj Date: Sun Dec 22 19:23:51 2019 New Revision: 520653 URL: https://svnweb.freebsd.org/changeset/ports/520653 Log: ports-mgmt/portal: fix build on GCC architectures Only add -L${NCURSESLIB} when ${NCURSESLIB} isn't /usr/lib to prevent linking with base libstdc++ on GCC architectures. PR: 240707 Approved by: culot (maintainer) Modified: head/ports-mgmt/portal/Makefile Modified: head/ports-mgmt/portal/Makefile ============================================================================== --- head/ports-mgmt/portal/Makefile Sun Dec 22 19:21:45 2019 (r520652) +++ head/ports-mgmt/portal/Makefile Sun Dec 22 19:23:51 2019 (r520653) @@ -10,8 +10,6 @@ COMMENT= Front-end to pkg(8) LICENSE= BSD2CLAUSE -BROKEN_powerpc64= fails to build: /usr/local/lib/gcc6/include/c++/thread:189: undefined reference to `std::thread::_State::~_State()' - PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz @@ -19,11 +17,16 @@ USE_GITHUB= yes GH_ACCOUNT= culot USES= ncurses compiler:c++11-lib + +.include + +.if ${NCURSESLIB} != /usr/lib CFLAGS+= -I${NCURSESINC} LDFLAGS+= -L${NCURSESLIB} +.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include +.include