1 |
jlec 10/03/29 19:00:29 |
2 |
|
3 |
Added: apbs-1.2.1b-openmp.patch |
4 |
apbs-1.2.1b-install-fix.patch |
5 |
Log: |
6 |
Configure fixes, removed unnecessary installed files. Make tools optional |
7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/apbs/files/apbs-1.2.1b-openmp.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-openmp.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-openmp.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: apbs-1.2.1b-openmp.patch |
16 |
=================================================================== |
17 |
diff --git a/configure.ac b/configure.ac |
18 |
index 24748bd..bd1b608 100644 |
19 |
--- a/configure.ac |
20 |
+++ b/configure.ac |
21 |
@@ -976,7 +976,6 @@ AC_MSG_CHECKING([for --disable-tools]) |
22 |
AC_ARG_ENABLE( |
23 |
[tools], |
24 |
AS_HELP_STRING([--disable-tools],[disable tool compilation]),, |
25 |
- [enable_tools=yes] |
26 |
) |
27 |
apbs_do_tools="" |
28 |
if test x"$enable_tools" != "xno"; then |
29 |
@@ -1134,22 +1133,17 @@ AC_MSG_CHECKING([for --disable-openmp]) |
30 |
AC_ARG_ENABLE( |
31 |
[openmp], |
32 |
AS_HELP_STRING([--disable-openmp],[disables OpenMP compiler support]),, |
33 |
- [disable_openmp=yes] |
34 |
) |
35 |
-if test x"$disable_openmp" != "xyes"; then |
36 |
- AC_MSG_RESULT([yes]) |
37 |
-else |
38 |
+if test x"$enable_openmp" != "xno"; then |
39 |
AC_MSG_RESULT([no]) |
40 |
if [[ "${CC}" = "icc" ] && [ "${F77}" = "ifort" ]]; then |
41 |
CFLAGS="${CFLAGS} -openmp" |
42 |
FFLAGS="${FFLAGS} -openmp -assume cc_omp" |
43 |
LDFLAGS="${LDFLAGS} -static-intel" |
44 |
fi |
45 |
- |
46 |
- if [[ "${CC}" = "gcc" ] && [ "${F77}" = "gfortran" ]]; then |
47 |
- gcc_version=`gcc --version` |
48 |
+ if [[[ "${CC}" = *gcc* ]]] && [[[ "${F77}" = *gfortran* ]]]; then |
49 |
+ gcc_version=`${CC} --version` |
50 |
gcc_complete_version=`echo ${gcc_version} | awk '{printf("%s",$3)}' | awk -F'.' '{print $1$2}'` |
51 |
- |
52 |
if test ["${gcc_complete_version}" -ge 42]; then |
53 |
CFLAGS="${CFLAGS} -fopenmp" |
54 |
FFLAGS="${FFLAGS} -fopenmp" |
55 |
@@ -1159,6 +1153,9 @@ else |
56 |
AC_MSG_RESULT([WARNING]) |
57 |
fi |
58 |
fi |
59 |
+else |
60 |
+ AC_MSG_RESULT([yes]) |
61 |
+ disable_openmp=yes |
62 |
fi |
63 |
|
64 |
dnl # ----------------------- |
65 |
|
66 |
|
67 |
|
68 |
1.1 sci-chemistry/apbs/files/apbs-1.2.1b-install-fix.patch |
69 |
|
70 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-install-fix.patch?rev=1.1&view=markup |
71 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/apbs/files/apbs-1.2.1b-install-fix.patch?rev=1.1&content-type=text/plain |
72 |
|
73 |
Index: apbs-1.2.1b-install-fix.patch |
74 |
=================================================================== |
75 |
diff --git a/Makefile.am b/Makefile.am |
76 |
index 437402d..b400095 100644 |
77 |
--- a/Makefile.am |
78 |
+++ b/Makefile.am |
79 |
@@ -27,11 +27,30 @@ clean-ac: |
80 |
install-exec-local: |
81 |
-rm -f ./bin/apbs |
82 |
|
83 |
-install-data-local: |
84 |
- mkdir -p ${prefix}/share |
85 |
- -cp -rf examples ${prefix}/share |
86 |
- -cp -rf doc ${prefix}/share |
87 |
- -cp -rf tools ${prefix}/share |
88 |
+install-data-local: install-cleanup |
89 |
+ -rm -f doc/LICENSE.txt |
90 |
+ |
91 |
+install-cleanup: |
92 |
+ -rm -f tools/manip/*.pyc |
93 |
+ -rm -f tools/**/*.o |
94 |
+ -rm -f tools/**/*.c |
95 |
+ -rm -f tools/**/*.f |
96 |
+ -rm -f tools/**/*Makefile* |
97 |
+ -rm -f tools/**/**/*.o |
98 |
+ -rm -f tools/**/**/*.c |
99 |
+ -rm -f tools/**/**/*.f |
100 |
+ -rm -f tools/**/**/*Makefile* |
101 |
+ -rm -f tools/*Makefile* |
102 |
+ -rm -f examples/*Makefile* |
103 |
+ -rm -f examples/**/*Makefile* |
104 |
+ |
105 |
+install-tools: |
106 |
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools |
107 |
+ -cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
108 |
+ |
109 |
+install-examples: |
110 |
+ mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples |
111 |
+ -cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/ |
112 |
|
113 |
test: |
114 |
cd examples; make test |
115 |
diff --git a/bin/Makefile.am b/bin/Makefile.am |
116 |
index 7b2f3ee..0470525 100644 |
117 |
--- a/bin/Makefile.am |
118 |
+++ b/bin/Makefile.am |
119 |
@@ -40,6 +40,4 @@ includedir = ${prefix}/include/apbs |
120 |
include_HEADERS = routines.h |
121 |
|
122 |
install-data-local: |
123 |
- -cp -p ${top_apbsdir}/bin/ApbsClient.py ${prefix}/bin |
124 |
- -chmod 755 ${prefix}/bin/ApbsClient.py |
125 |
- -rm -f ${prefix}/bin/wsdl2py |
126 |
\ No newline at end of file |
127 |
+ -rm -f $(DESTDIR)${prefix}/bin/wsdl2py |