| 1 |
commit: 36d95ed46734e64b54d67cde8bd3b40fe093f8e0 |
| 2 |
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 2 19:11:49 2013 +0000 |
| 4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 2 19:17:32 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36d95ed4 |
| 7 |
|
| 8 |
clean up |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.1 |
| 11 |
|
| 12 |
--- |
| 13 |
sci-libs/fftw/ChangeLog | 4 ++++ |
| 14 |
sci-libs/fftw/fftw-3.3.3-r3.ebuild | 38 +++++++++++++++++--------------------- |
| 15 |
sci-libs/fftw/fftw-9999.ebuild | 38 +++++++++++++++++--------------------- |
| 16 |
3 files changed, 38 insertions(+), 42 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog |
| 19 |
index d82a81d..1d66bfd 100644 |
| 20 |
--- a/sci-libs/fftw/ChangeLog |
| 21 |
+++ b/sci-libs/fftw/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 02 Sep 2013; Christoph Junghans <ottxor@g.o> fftw-3.3.3-r3.ebuild, |
| 27 |
+ fftw-9999.ebuild: |
| 28 |
+ clean up |
| 29 |
+ |
| 30 |
*fftw-3.3.3-r3 (01 Sep 2013) |
| 31 |
*fftw-9999 (01 Sep 2013) |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-libs/fftw/fftw-3.3.3-r3.ebuild b/sci-libs/fftw/fftw-3.3.3-r3.ebuild |
| 35 |
index 9af7694..c839eb5 100644 |
| 36 |
--- a/sci-libs/fftw/fftw-3.3.3-r3.ebuild |
| 37 |
+++ b/sci-libs/fftw/fftw-3.3.3-r3.ebuild |
| 38 |
@@ -40,6 +40,7 @@ MULTILIB_WRAPPED_HEADERS=( |
| 39 |
/usr/include/fftw3-mpi.h |
| 40 |
/usr/include/fftw3l-mpi.f03 |
| 41 |
/usr/include/fftw3-mpi.f03 |
| 42 |
+ /usr/include/fftw3l.f03 |
| 43 |
/usr/include/fftw3q.f03 |
| 44 |
) |
| 45 |
|
| 46 |
@@ -90,7 +91,14 @@ src_configure() { |
| 47 |
multilib_is_native_abi || enable_mpi="--disable-mpi" |
| 48 |
|
| 49 |
#jlec reported USE=quad on abi_x86_32 has too less registers |
| 50 |
- multilib_is_native_abi || [[ $x != quad ]] || return 0 |
| 51 |
+ #stub Makefiles |
| 52 |
+ if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then |
| 53 |
+ mkdir -p "${BUILD_DIR}/tests" || die |
| 54 |
+ echo "all: ;" > "${BUILD_DIR}/Makefile" || die |
| 55 |
+ echo "install: ;" >> "${BUILD_DIR}/Makefile" || die |
| 56 |
+ echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die |
| 57 |
+ return 0 |
| 58 |
+ fi |
| 59 |
|
| 60 |
myeconfargs=( |
| 61 |
$(use_enable fma) |
| 62 |
@@ -140,14 +148,8 @@ src_configure() { |
| 63 |
multibuild_foreach_variant my_abi_configure |
| 64 |
} |
| 65 |
|
| 66 |
-abi_has_precision() { |
| 67 |
- #not all abi have all precisions |
| 68 |
- [[ -f ${BUILD_DIR}/Makefile ]] || return 0 |
| 69 |
- "$@" |
| 70 |
-} |
| 71 |
- |
| 72 |
src_compile() { |
| 73 |
- multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile |
| 74 |
+ multibuild_foreach_variant autotools-multilib_src_compile |
| 75 |
} |
| 76 |
|
| 77 |
src_test () { |
| 78 |
@@ -156,7 +158,7 @@ src_test () { |
| 79 |
# Do not increase the number of threads, it will not help your performance |
| 80 |
#local testbase="perl check.pl --nthreads=1 --estimate" |
| 81 |
# ${testbase} -${p}d || die "Failure: $n" |
| 82 |
- multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck |
| 83 |
+ multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck |
| 84 |
} |
| 85 |
|
| 86 |
src_install () { |
| 87 |
@@ -166,19 +168,13 @@ src_install () { |
| 88 |
|
| 89 |
#copied from autotools-multilib_secure_install |
| 90 |
my_abi_src_install() { |
| 91 |
- my_abi_secure_install() { |
| 92 |
- autotools-utils_src_install |
| 93 |
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |
| 94 |
- multilib_prepare_wrappers |
| 95 |
- multilib_check_headers |
| 96 |
- fi |
| 97 |
- } |
| 98 |
- |
| 99 |
- multilib_foreach_abi abi_has_precision my_abi_secure_install |
| 100 |
- #don't mix checksum of different precisions |
| 101 |
- rm -f "${T}"/.multilib_header_cksum |
| 102 |
+ autotools-utils_src_install |
| 103 |
+ if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |
| 104 |
+ multilib_prepare_wrappers |
| 105 |
+ multilib_check_headers |
| 106 |
+ fi |
| 107 |
} |
| 108 |
- multibuild_foreach_variant my_abi_src_install |
| 109 |
+ multibuild_foreach_variant multilib_foreach_abi my_abi_src_install |
| 110 |
multilib_install_wrappers |
| 111 |
|
| 112 |
if use doc; then |
| 113 |
|
| 114 |
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild |
| 115 |
index 9af7694..c839eb5 100644 |
| 116 |
--- a/sci-libs/fftw/fftw-9999.ebuild |
| 117 |
+++ b/sci-libs/fftw/fftw-9999.ebuild |
| 118 |
@@ -40,6 +40,7 @@ MULTILIB_WRAPPED_HEADERS=( |
| 119 |
/usr/include/fftw3-mpi.h |
| 120 |
/usr/include/fftw3l-mpi.f03 |
| 121 |
/usr/include/fftw3-mpi.f03 |
| 122 |
+ /usr/include/fftw3l.f03 |
| 123 |
/usr/include/fftw3q.f03 |
| 124 |
) |
| 125 |
|
| 126 |
@@ -90,7 +91,14 @@ src_configure() { |
| 127 |
multilib_is_native_abi || enable_mpi="--disable-mpi" |
| 128 |
|
| 129 |
#jlec reported USE=quad on abi_x86_32 has too less registers |
| 130 |
- multilib_is_native_abi || [[ $x != quad ]] || return 0 |
| 131 |
+ #stub Makefiles |
| 132 |
+ if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then |
| 133 |
+ mkdir -p "${BUILD_DIR}/tests" || die |
| 134 |
+ echo "all: ;" > "${BUILD_DIR}/Makefile" || die |
| 135 |
+ echo "install: ;" >> "${BUILD_DIR}/Makefile" || die |
| 136 |
+ echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die |
| 137 |
+ return 0 |
| 138 |
+ fi |
| 139 |
|
| 140 |
myeconfargs=( |
| 141 |
$(use_enable fma) |
| 142 |
@@ -140,14 +148,8 @@ src_configure() { |
| 143 |
multibuild_foreach_variant my_abi_configure |
| 144 |
} |
| 145 |
|
| 146 |
-abi_has_precision() { |
| 147 |
- #not all abi have all precisions |
| 148 |
- [[ -f ${BUILD_DIR}/Makefile ]] || return 0 |
| 149 |
- "$@" |
| 150 |
-} |
| 151 |
- |
| 152 |
src_compile() { |
| 153 |
- multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile |
| 154 |
+ multibuild_foreach_variant autotools-multilib_src_compile |
| 155 |
} |
| 156 |
|
| 157 |
src_test () { |
| 158 |
@@ -156,7 +158,7 @@ src_test () { |
| 159 |
# Do not increase the number of threads, it will not help your performance |
| 160 |
#local testbase="perl check.pl --nthreads=1 --estimate" |
| 161 |
# ${testbase} -${p}d || die "Failure: $n" |
| 162 |
- multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck |
| 163 |
+ multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck |
| 164 |
} |
| 165 |
|
| 166 |
src_install () { |
| 167 |
@@ -166,19 +168,13 @@ src_install () { |
| 168 |
|
| 169 |
#copied from autotools-multilib_secure_install |
| 170 |
my_abi_src_install() { |
| 171 |
- my_abi_secure_install() { |
| 172 |
- autotools-utils_src_install |
| 173 |
- if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |
| 174 |
- multilib_prepare_wrappers |
| 175 |
- multilib_check_headers |
| 176 |
- fi |
| 177 |
- } |
| 178 |
- |
| 179 |
- multilib_foreach_abi abi_has_precision my_abi_secure_install |
| 180 |
- #don't mix checksum of different precisions |
| 181 |
- rm -f "${T}"/.multilib_header_cksum |
| 182 |
+ autotools-utils_src_install |
| 183 |
+ if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then |
| 184 |
+ multilib_prepare_wrappers |
| 185 |
+ multilib_check_headers |
| 186 |
+ fi |
| 187 |
} |
| 188 |
- multibuild_foreach_variant my_abi_src_install |
| 189 |
+ multibuild_foreach_variant multilib_foreach_abi my_abi_src_install |
| 190 |
multilib_install_wrappers |
| 191 |
|
| 192 |
if use doc; then |
Archives