| 1 |
jlec 10/02/02 21:43:50 |
| 2 |
|
| 3 |
Added: 612-gentoo.patch |
| 4 |
Log: |
| 5 |
Another split library from ccp4 |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-libs/libjwc_f/files/612-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libjwc_f/files/612-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libjwc_f/files/612-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 612-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nu libjwc_f-1.1/configure.in ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in |
| 17 |
--- libjwc_f-1.1/configure.in 1999-10-21 16:07:14.000000000 +0200 |
| 18 |
+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/configure.in 2004-03-11 17:31:45.000000000 +0100 |
| 19 |
@@ -8,6 +8,7 @@ |
| 20 |
AC_CANONICAL_SYSTEM |
| 21 |
|
| 22 |
AM_INIT_AUTOMAKE(libjwc_f, 1.1) |
| 23 |
+AM_MAINTAINER_MODE |
| 24 |
|
| 25 |
case ${with_g77} in |
| 26 |
"yes" ) CC="gcc" GCC=yes F77=g77 ;; |
| 27 |
@@ -17,7 +18,7 @@ |
| 28 |
AC_PROG_F77 |
| 29 |
|
| 30 |
AC_PROG_INSTALL |
| 31 |
-AC_PROG_RANLIB |
| 32 |
+AC_PROG_LIBTOOL |
| 33 |
|
| 34 |
case "$target" in |
| 35 |
*irix6* ) |
| 36 |
@@ -26,8 +27,9 @@ |
| 37 |
case "$FFLAGS" in |
| 38 |
*-64* ) ;; # assume they meant it |
| 39 |
*-o32* | *-32* ) ;; # presumably OK |
| 40 |
- * ) FFLAGS="$FFLAGS -o32 -O -g3" |
| 41 |
- CFLAGS=-32 |
| 42 |
+ *-n32* ) ;; |
| 43 |
+ * ) FFLAGS="$FFLAGS -n32 -O -g3" |
| 44 |
+ CFLAGS=-n32 |
| 45 |
AC_MSG_WARN([ |
| 46 |
|
| 47 |
*** Using compiler flag -o32 for probable compatibility with |
| 48 |
@@ -47,8 +49,33 @@ |
| 49 |
*** See the INSTALL file for more info. |
| 50 |
]) |
| 51 |
fi ;; |
| 52 |
+ *linux* ) |
| 53 |
+ case $F77 in |
| 54 |
+ g77*) |
| 55 |
+ case "$FFLAGS" in |
| 56 |
+ *no-second-underscore* ) ;; # presumably OK |
| 57 |
+ * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;; |
| 58 |
+ esac |
| 59 |
+ esac ;; |
| 60 |
+ *darwin* ) |
| 61 |
+ case $F77 in |
| 62 |
+ g77*) |
| 63 |
+ case "$FFLAGS" in |
| 64 |
+ *no-second-underscore* ) ;; # presumably OK |
| 65 |
+ * ) FFLAGS="$FFLAGS -fno-second-underscore -fno-globals" ;; |
| 66 |
+ esac |
| 67 |
+#mac g77 currently goes not handle -fno-common |
| 68 |
+ enable_shared=no; |
| 69 |
+ esac ;; |
| 70 |
* ) |
| 71 |
esac |
| 72 |
+# efc, version 7.1 at least does not support soname, so use CC |
| 73 |
+case "$F77" in |
| 74 |
+ *efc ) F77LD=${F77LD:-'${CC}'} ;; |
| 75 |
+ * ) F77LD=${F77LD:-'${F77}'} |
| 76 |
+esac |
| 77 |
+ |
| 78 |
+AC_SUBST(F77LD) |
| 79 |
|
| 80 |
AM_PROG_LIBTOOL |
| 81 |
|
| 82 |
Common subdirectories: libjwc_f-1.1/doc and ccp4-6.1.2/x-windows/libjwc/libjwc_f/doc |
| 83 |
diff -Nu libjwc_f-1.1/opn_scr.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f |
| 84 |
--- libjwc_f-1.1/opn_scr.f 1999-09-07 12:50:13.000000000 +0200 |
| 85 |
+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/opn_scr.f 2000-10-25 13:03:09.000000000 +0200 |
| 86 |
@@ -16,6 +16,6 @@ |
| 87 |
C |
| 88 |
C====== Open the file |
| 89 |
C |
| 90 |
- OPEN (IUN_SCR, STATUS='SCRATCH') |
| 91 |
- RETURN |
| 92 |
+C OPEN (IUN_SCR, STATUS='SCRATCH') |
| 93 |
+ CALL CCPDPN(IUN_SCR,'JWCSCR','SCRATCH','U',0, IFAIL) |
| 94 |
END |
| 95 |
diff -Nu libjwc_f-1.1/rpf_dstar.f ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f |
| 96 |
--- libjwc_f-1.1/rpf_dstar.f 1999-07-09 13:39:38.000000000 +0200 |
| 97 |
+++ ccp4-6.1.2/x-windows/libjwc/libjwc_f/rpf_dstar.f 2004-06-04 12:10:59.000000000 +0200 |
| 98 |
@@ -376,7 +376,8 @@ |
| 99 |
INR_FLAG = 2 |
| 100 |
PHIW = 0.0 |
| 101 |
END IF |
| 102 |
- ELSE |
| 103 |
+ RETURN |
| 104 |
+ ENDIF |
| 105 |
C |
| 106 |
C---- Calculate distance of edge of spot from sphere at end of rotation |
| 107 |
Crotgen.for |
| 108 |
@@ -418,7 +419,6 @@ |
| 109 |
INR_FLAG = 4 |
| 110 |
40 RETURN |
| 111 |
END IF |
| 112 |
- END IF |
| 113 |
END IF |
| 114 |
RETURN |
| 115 |
END |
Archives