From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 953B513835B for ; Fri, 11 Jun 2021 00:29:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4285E090F; Fri, 11 Jun 2021 00:29:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8657E090F for ; Fri, 11 Jun 2021 00:29:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9876033F6A5 for ; Fri, 11 Jun 2021 00:29:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AE867AF for ; Fri, 11 Jun 2021 00:29:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623371354.bbaa144be1ae371f080bd71813b288fa3f1ff51b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/ucsc-genome-browser/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild X-VCS-Directories: sci-biology/ucsc-genome-browser/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bbaa144be1ae371f080bd71813b288fa3f1ff51b X-VCS-Branch: master Date: Fri, 11 Jun 2021 00:29:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4ef81ba-d0d8-4b97-8611-c357c92dfdb0 X-Archives-Hash: 6f46ca0754b492291ec872fa3b78f45d commit: bbaa144be1ae371f080bd71813b288fa3f1ff51b Author: Sam James gentoo org> AuthorDate: Fri Jun 11 00:26:53 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 11 00:29:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaa144b sci-biology/ucsc-genome-browser: fix VariableScope ((E)ROOT) Signed-off-by: Sam James gentoo.org> .../ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild index 0423f509cec..f0bb0676ae8 100644 --- a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild +++ b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild @@ -64,14 +64,16 @@ src_compile() { export MYSQLLIBS="none" MYSQLINC="none" DOCUMENTROOT="none" CGI_BIN="none" - use mysql && export MYSQLLIBS="-L${EROOT}usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \ - MYSQLINC="${ROOT}usr/include/mysql" + # TODO: Change ${EPREFIX} to ${ESYSROOT} in EAPI 7 + # (and ideally use pkg-config here) + use mysql && export MYSQLLIBS="-L${EPREFIX%/}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \ + MYSQLINC="${EPREFIX%/}/usr/include/mysql" use server && export DOCUMENTROOT="${WORKDIR}/destdir/${MY_HTDOCSDIR}" \ CGI_BIN="${WORKDIR}/destdir/${MY_HTDOCSDIR}/cgi-bin" - mkdir -p "$BINDIR" "$SCRIPTS" "$ENCODE_PIPELINE_BIN" || die - use server && mkdir -p "$CGI_BIN" "$DOCUMENTROOT" + mkdir -p "${BINDIR}" "${SCRIPTS}" "${ENCODE_PIPELINE_BIN}" || die + use server && mkdir -p "${CGI_BIN}" "${DOCUMENTROOT}" emake -C src clean emake -C src/lib