| 1 |
commit: e511f5d6560ada25deb2db350a87be446fd9ceb4 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat May 7 00:48:07 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat May 7 00:48:07 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e511f5d6 |
| 7 |
|
| 8 |
octaveforge.eclass: use PN instead of OCT_PKG |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
eclass/octaveforge.eclass | 14 ++++++++------ |
| 13 |
1 file changed, 8 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/octaveforge.eclass b/eclass/octaveforge.eclass |
| 16 |
index 8f8def97a..ed609cd8c 100644 |
| 17 |
--- a/eclass/octaveforge.eclass |
| 18 |
+++ b/eclass/octaveforge.eclass |
| 19 |
@@ -79,7 +79,6 @@ octaveforge_src_prepare() { |
| 20 |
octaveforge_src_compile() { |
| 21 |
PKGDIR="$(pwd | sed -e 's|^.*/||' || die)" |
| 22 |
export OCT_PACKAGE="${TMPDIR}/${PKGDIR}.tar.gz" |
| 23 |
- export OCT_PKG=$(echo "${PKGDIR}" | sed -e 's|^\(.*\)-.*|\1|' || die) |
| 24 |
export MKOCTFILE="mkoctfile -v" |
| 25 |
|
| 26 |
cmd="disp(__octave_config_info__('octlibdir'));" |
| 27 |
@@ -120,10 +119,12 @@ octaveforge_src_install() { |
| 28 |
if [[ "X${DESTDIR}X" = "XX" ]]; then |
| 29 |
cmd=" |
| 30 |
warning('off','all'); |
| 31 |
- pkg('install','${OCT_PACKAGE}');l=pkg('list'); |
| 32 |
- disp(l{cellfun(@(x)strcmp(x.name,'${OCT_PKG}'),l)}.dir); |
| 33 |
+ pkg('install','${OCT_PACKAGE}'); |
| 34 |
+ l=pkg('list'); |
| 35 |
+ disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir); |
| 36 |
+ ${stripcmd} |
| 37 |
" |
| 38 |
- oct_pkgdir=$(octavecommand "${cmd}${stripcmd}" || die) |
| 39 |
+ oct_pkgdir=$(octavecommand "${cmd}" || die) |
| 40 |
else |
| 41 |
cmd="disp(fullfile(__octave_config_info__('datadir'),'octave'));" |
| 42 |
shareprefix=${DESTDIR}/$(octavecommand "${cmd}" || die) |
| 43 |
@@ -151,9 +152,10 @@ octaveforge_src_install() { |
| 44 |
pkg('global_list',fullfile('${shareprefix}','octave_packages')); |
| 45 |
pkg('local_list',fullfile('${shareprefix}','octave_packages')); |
| 46 |
l=pkg('list'); |
| 47 |
- disp(l{cellfun(@(x)strcmp(x.name,'${OCT_PKG}'),l)}.dir); |
| 48 |
+ disp(l{cellfun(@(x)strcmp(x.name,'${PN}'),l)}.dir); |
| 49 |
+ ${stripcmd} |
| 50 |
" |
| 51 |
- oct_pkgdir=$(octavecommand "${cmd}${stripcmd}" || die) |
| 52 |
+ oct_pkgdir=$(octavecommand "${cmd}" || die) |
| 53 |
fi |
| 54 |
export oct_pkgdir |
Archives