| 1 |
jlec 10/06/26 10:53:30 |
| 2 |
|
| 3 |
Added: 6.0.4-change-default-directories.patch |
| 4 |
6.0.4-test.patch |
| 5 |
Log: |
| 6 |
Version Bump |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-physics/abinit/files/6.0.4-change-default-directories.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/abinit/files/6.0.4-change-default-directories.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/abinit/files/6.0.4-change-default-directories.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 6.0.4-change-default-directories.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/config/m4/conf-init.m4 b/config/m4/conf-init.m4 |
| 18 |
index 3a20c30..8e84730 100644 |
| 19 |
--- a/config/m4/conf-init.m4 |
| 20 |
+++ b/config/m4/conf-init.m4 |
| 21 |
@@ -315,15 +315,15 @@ AC_DEFUN([ABI_INIT_INSTALL_DIRS],[ |
| 22 |
fi |
| 23 |
|
| 24 |
dnl Set-up all directory names |
| 25 |
- abinit_bindir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/bin" |
| 26 |
- abinit_chkdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/tests" |
| 27 |
- abinit_datdir="${abinit_prefix}/abinit" |
| 28 |
- abinit_docdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/doc" |
| 29 |
- abinit_incdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/include" |
| 30 |
- abinit_libdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/lib" |
| 31 |
- abinit_mandir="${abinit_prefix}/abinit/man" |
| 32 |
- abinit_rundir="${abinit_prefix}/abinit/bin" |
| 33 |
- abinit_wwwdir="${abinit_prefix}/abinit/${ABINIT_VERSION_BASE}/www" |
| 34 |
+ abinit_bindir="${abinit_prefix}/bin" |
| 35 |
+ abinit_chkdir="${abinit_prefix}/share/abinit/tests" |
| 36 |
+ abinit_datdir="${abinit_prefix}/share/abinit" |
| 37 |
+ abinit_docdir="${abinit_prefix}/share/doc/abinit-${ABINIT_VERSION_BASE}" |
| 38 |
+ abinit_incdir="${includedir}/abinit" |
| 39 |
+ abinit_libdir="${libdir}" |
| 40 |
+ abinit_mandir="${abinit_prefix}/share/man/man" |
| 41 |
+ abinit_rundir="${abinit_prefix}/bin" |
| 42 |
+ abinit_wwwdir="${abinit_prefix}/share/abinit/www" |
| 43 |
|
| 44 |
dnl Substitute all variables |
| 45 |
AC_SUBST(abinit_prefix) |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 sci-physics/abinit/files/6.0.4-test.patch |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/abinit/files/6.0.4-test.patch?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-physics/abinit/files/6.0.4-test.patch?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: 6.0.4-test.patch |
| 55 |
=================================================================== |
| 56 |
diff --git a/tests/Scripts/wrap-parallel-tests.sh b/tests/Scripts/wrap-parallel-tests.sh |
| 57 |
index 91d1ef9..b199627 100755 |
| 58 |
--- a/tests/Scripts/wrap-parallel-tests.sh |
| 59 |
+++ b/tests/Scripts/wrap-parallel-tests.sh |
| 60 |
@@ -22,7 +22,7 @@ set -e |
| 61 |
|
| 62 |
# Init |
| 63 |
my_name="wrap-parallel-tests" |
| 64 |
-my_cnffile="./tests.env" |
| 65 |
+my_cnffile="../tests/tests.env" |
| 66 |
paral_sets="A B C D E F G H I J K L M N O P R T U V X Y" |
| 67 |
#mpiio_sets="A" |
| 68 |
mpiio_sets="A P Q R T X Y" |
| 69 |
diff --git a/tests/Scripts/wrap-standard-tests.sh b/tests/Scripts/wrap-standard-tests.sh |
| 70 |
index 1b9fd72..26caff6 100755 |
| 71 |
--- a/tests/Scripts/wrap-standard-tests.sh |
| 72 |
+++ b/tests/Scripts/wrap-standard-tests.sh |
| 73 |
@@ -3,7 +3,7 @@ |
| 74 |
# |
| 75 |
|
| 76 |
my_name="wrap-standard-tests" |
| 77 |
-my_cnffile="tests.env" |
| 78 |
+my_cnffile="../tests/tests.env" |
| 79 |
|
| 80 |
# Check arguments |
| 81 |
if test "${#}" -lt "1"; then |
Archives