Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/ucsc-genome-browser/
Date: Fri, 11 Jun 2021 00:29:28
Message-Id: 1623371354.bbaa144be1ae371f080bd71813b288fa3f1ff51b.sam@gentoo
1 commit: bbaa144be1ae371f080bd71813b288fa3f1ff51b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 11 00:26:53 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 00:29:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbaa144b
7
8 sci-biology/ucsc-genome-browser: fix VariableScope ((E)ROOT)
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild | 10 ++++++----
13 1 file changed, 6 insertions(+), 4 deletions(-)
14
15 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
16 index 0423f509cec..f0bb0676ae8 100644
17 --- a/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
18 +++ b/sci-biology/ucsc-genome-browser/ucsc-genome-browser-260-r1.ebuild
19 @@ -64,14 +64,16 @@ src_compile() {
20
21 export MYSQLLIBS="none" MYSQLINC="none" DOCUMENTROOT="none" CGI_BIN="none"
22
23 - use mysql && export MYSQLLIBS="-L${EROOT}usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
24 - MYSQLINC="${ROOT}usr/include/mysql"
25 + # TODO: Change ${EPREFIX} to ${ESYSROOT} in EAPI 7
26 + # (and ideally use pkg-config here)
27 + use mysql && export MYSQLLIBS="-L${EPREFIX%/}/usr/$(get_libdir)/mysql/ -lmysqlclient -lz -lssl" \
28 + MYSQLINC="${EPREFIX%/}/usr/include/mysql"
29
30 use server && export DOCUMENTROOT="${WORKDIR}/destdir/${MY_HTDOCSDIR}" \
31 CGI_BIN="${WORKDIR}/destdir/${MY_HTDOCSDIR}/cgi-bin"
32
33 - mkdir -p "$BINDIR" "$SCRIPTS" "$ENCODE_PIPELINE_BIN" || die
34 - use server && mkdir -p "$CGI_BIN" "$DOCUMENTROOT"
35 + mkdir -p "${BINDIR}" "${SCRIPTS}" "${ENCODE_PIPELINE_BIN}" || die
36 + use server && mkdir -p "${CGI_BIN}" "${DOCUMENTROOT}"
37
38 emake -C src clean
39 emake -C src/lib