Mercurial > forge
changeset 2777:699db257153d octave-forge
Fix srpm build using local_list and global_list variables of pkg that will be in 2.9.10
| author | adb014 |
|---|---|
| date | Thu, 30 Nov 2006 13:07:10 +0000 |
| parents | 56be401b6fdb |
| children | 8d864908605d |
| files | admin/rpm_template.in packages/Makefile |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/rpm_template.in Thu Nov 30 13:06:08 2006 +0000 +++ b/admin/rpm_template.in Thu Nov 30 13:07:10 2006 +0000 @@ -39,7 +39,7 @@ %build cd @NAME@-@VERSION@ -HOME=`pwd` %{octave} -H -q --no-site-file --eval 'pkg('prefix',[pwd(),'/install']);pkg("install","@PACKAGE@")' +HOME=`pwd` %{octave} -H -q --no-site-file --eval "pkg('prefix',[pwd(),'/install']);pkg('local_list',[pwd(),'/install/.octave_packages']);pkg('global_list',[pwd(),'/install/.octave_packages']);pkg('install','@PACKAGE@')" cd install mv @NAME@-@VERSION@/packinfo/* @NAME@ rm -rf @NAME@-@VERSION@/packinfo
--- a/packages/Makefile Thu Nov 30 13:06:08 2006 +0000 +++ b/packages/Makefile Thu Nov 30 13:07:10 2006 +0000 @@ -58,7 +58,7 @@ @echo "Running test code for $(opkg) and its dependencies" ; \ cd sandbox; \ $(TOPDIR)/admin/mktests.sh code; \ - $(RUN_OCTAVE) --eval "pkg('prefix',[pwd(),'/install']);pkg('load','all');addpath(genpath('./'),'-end');fntests" ; \ + $(RUN_OCTAVE) --eval "pkg('prefix',[pwd(),'/install']);pkg('local_list',[pwd(),'/install/.octave_packages']);pkg('global_list',[pwd(),'/install/.octave_packages']);pkg('load','all');addpath(genpath('./'),'-end');fntests" ; \ if [ ! -e $(TESTLOG) ]; then touch $(TESTLOG); fi ; \ cat fntests.log >> $(TESTLOG); \ cd .. @@ -84,7 +84,7 @@ if [ ! -d code ]; then mkdir code; fi; \ cd code; tar xzf ../../$(opkg); cd ..; \ pkgs="'../$(opkg)'"; \ - until $(RUN_OCTAVE) --eval "pkg('prefix',[pwd(),'/install']);pkg('install',$$pkgs)" 2> baddeps; do \ + until $(RUN_OCTAVE) --eval "pkg('prefix',[pwd(),'/install']);pkg('local_list',[pwd(),'/install/.octave_packages']);pkg('global_list',[pwd(),'/install/.octave_packages']);pkg('install',$$pkgs)" 2> baddeps; do \ deps=`cat baddeps | grep " needs " | sed -e 's/^.*needs\s\+\(\S*\).*$$/\1/'`; \ ops=`cat baddeps | grep " needs " | sed -e 's/^.*needs\s\+\S*\s\+\(\S*\).*$$/\1/'`; \ vers=`cat baddeps | grep " needs " | sed -e 's/^.*\s\+\(\S*\)\s*$$/\1/'`; \