Gentoo Archives: gentoo-commits

From: Alessandro Barbieri <lssndrbarbieri@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/
Date: Sun, 08 May 2022 01:58:27
Message-Id: 1651975088.95b85988993f04b6be454b7ef8effe91aa028320.Alessandro-Barbieri@gentoo
1 commit: 95b85988993f04b6be454b7ef8effe91aa028320
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sun May 8 01:04:45 2022 +0000
4 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
5 CommitDate: Sun May 8 01:58:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=95b85988
7
8 octaveforge.eclass: fix some issues while moving in folders
9
10 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
11
12 eclass/octaveforge.eclass | 7 ++++---
13 1 file changed, 4 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/octaveforge.eclass b/eclass/octaveforge.eclass
16 index 67eb8aece..fb708e3a7 100644
17 --- a/eclass/octaveforge.eclass
18 +++ b/eclass/octaveforge.eclass
19 @@ -51,7 +51,6 @@ octaveforge_src_unpack() {
20 default
21 if [[ ! -d "${WORKDIR}/${P}" ]]; then
22 S="${WORKDIR}/${PN}"
23 - pushd "${S}" || die
24 fi
25 }
26
27 @@ -61,13 +60,15 @@ octaveforge_src_unpack() {
28 octaveforge_src_prepare() {
29 _generate_configure
30
31 - pushd "${S}/src" || die
32 if [[ -e "${S}/src/configure.ac" ]]; then
33 + pushd "${S}/src" || die
34 eautoreconf
35 + popd || die
36 elif [[ -e "${S}/src/autogen.sh" ]]; then
37 + pushd "${S}/src" || die
38 ./autogen.sh || die 'failed to run autogen.sh'
39 + popd || die
40 fi
41 - popd || die
42 if [[ -e "${S}/src/Makefile" ]]; then
43 sed -i 's/ -s / /g' "${S}/src/Makefile" || die 'sed failed.'
44 fi