| 1 |
bicatali 09/08/26 06:18:25 |
| 2 |
|
| 3 |
Modified: cfitsio-3.140-autotools.patch |
| 4 |
Log: |
| 5 |
Better autotools patch, ready to resend upstream |
| 6 |
(Portage version: 2.2_rc38/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: cfitsio-3.140-autotools.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- cfitsio-3.140-autotools.patch 19 Mar 2009 22:43:52 -0000 1.1 |
| 22 |
+++ cfitsio-3.140-autotools.patch 26 Aug 2009 06:18:25 -0000 1.2 |
| 23 |
@@ -1,6 +1,24 @@ |
| 24 |
---- configure.ac.absent 1970-01-01 01:00:00.000000000 +0100 |
| 25 |
-+++ configure.ac 2008-06-02 01:08:32.000000000 +0100 |
| 26 |
-@@ -0,0 +1,158 @@ |
| 27 |
+--- cfitsio.pc.in.orig 2008-06-02 01:20:50.000000000 +0100 |
| 28 |
++++ cfitsio.pc.in 2008-06-02 01:22:14.000000000 +0100 |
| 29 |
+@@ -1,10 +1,10 @@ |
| 30 |
+ prefix=@prefix@ |
| 31 |
+ exec_prefix=@exec_prefix@ |
| 32 |
+-libdir=${exec_prefix}/lib |
| 33 |
+-includedir=${prefix}/include |
| 34 |
++libdir=@libdir@ |
| 35 |
++includedir=@includedir@ |
| 36 |
+ |
| 37 |
+-Name: cfitsio |
| 38 |
++Name: @PACKAGE_NAME@ |
| 39 |
+ Description: FITS File Subroutine Library |
| 40 |
+-Version: 3.006 |
| 41 |
+-Libs: -L${libdir} -lcfitsio @LIBS@ -lm |
| 42 |
++Version: @PACKAGE_VERSION@ |
| 43 |
++Libs: -L${libdir} -lcfitsio @LIBS@ |
| 44 |
+ Cflags: -I${includedir} |
| 45 |
+--- configure.ac.orig 1970-01-01 01:00:00.000000000 +0100 |
| 46 |
++++ configure.ac 2009-08-20 00:25:49.000000000 +0100 |
| 47 |
+@@ -0,0 +1,181 @@ |
| 48 |
+AC_PREREQ(2.59) |
| 49 |
+AC_INIT([cfitsio], [3.140], [pence@×××××××××××××××.gov]) |
| 50 |
+AC_CONFIG_SRCDIR([fitscore.c]) |
| 51 |
@@ -17,29 +35,34 @@ |
| 52 |
+ |
| 53 |
+AC_MSG_CHECKING([whether to enable fortran interface]) |
| 54 |
+AC_ARG_ENABLE([fortran], |
| 55 |
-+ AS_HELP_STRING([--enable-fortran], [Build the fortran interface]), |
| 56 |
-+ [ENABLE_FORTRAN=$enableval |
| 57 |
-+ AC_MSG_RESULT([$enableval])], |
| 58 |
-+ [ENABLE_FORTRAN=no |
| 59 |
-+ AC_MSG_RESULT([no])] |
| 60 |
-+) |
| 61 |
++ [AS_HELP_STRING([--enable-fortran], [Compile the fortran interface [default=yes]])], |
| 62 |
++ [ENABLE_FORTRAN=$enableval]) |
| 63 |
+ |
| 64 |
-+if test x"$ENABLE_FORTRAN" = x"yes" ; then |
| 65 |
-+ AC_PROG_F77 |
| 66 |
-+ if test x$F77 = xg77; then |
| 67 |
++case x"$ENABLE_FORTRAN" in |
| 68 |
++ *) |
| 69 |
++ ENABLE_FORTRAN=yes |
| 70 |
++ AC_MSG_RESULT([yes]) |
| 71 |
++ AC_PROG_F77 |
| 72 |
++ if test x$F77 = xg77; then |
| 73 |
+ cfortran_def=g77Fortran |
| 74 |
-+ elif test x$F77 = xifort ; then |
| 75 |
++ elif test x$F77 = xifort ; then |
| 76 |
+ cfortran_def=INTEL_COMPILER |
| 77 |
-+ elif test x$F77 = xgfortran ; then |
| 78 |
++ elif test x$F77 = xgfortran ; then |
| 79 |
+ cfortran_def=gFortran |
| 80 |
-+ elif test x$F77 = xpgf77 ; then |
| 81 |
++ elif test x$F77 = xpgf77 ; then |
| 82 |
+ cfortran_def=pgiFortran |
| 83 |
-+ else |
| 84 |
++ else |
| 85 |
+ cfortran_def=f2cFortran |
| 86 |
-+ fi |
| 87 |
-+ CPPFLAGS_FORTRAN="-D$cfortran_def" |
| 88 |
-+ AC_SUBST(CPPFLAGS_FORTRAN) |
| 89 |
-+fi |
| 90 |
++ fi |
| 91 |
++ CPPFLAGS_FORTRAN="-D$cfortran_def" |
| 92 |
++ AC_SUBST(CPPFLAGS_FORTRAN) |
| 93 |
++ ;; |
| 94 |
++ xno) |
| 95 |
++ ENABLE_FORTRAN=no |
| 96 |
++ AC_MSG_RESULT([no]) |
| 97 |
++ ;; |
| 98 |
++esac |
| 99 |
++ |
| 100 |
+AC_SUBST([ENABLE_FORTRAN]) |
| 101 |
+AM_CONDITIONAL([ENABLE_FORTRAN], test "x$ENABLE_FORTRAN" = "xyes") |
| 102 |
+ |
| 103 |
@@ -93,6 +116,7 @@ |
| 104 |
+ [Define to 1 if your compiler supports long long])] |
| 105 |
+) |
| 106 |
+dnl check for flock_t |
| 107 |
++AC_MSG_CHECKING([for flock_t in sys/fcntl.h]) |
| 108 |
+AC_COMPILE_IFELSE( |
| 109 |
+ [AC_LANG_PROGRAM([[ |
| 110 |
+#include <sys/fcntl.h> |
| 111 |
@@ -100,10 +124,11 @@ |
| 112 |
+flock_t filler; |
| 113 |
+ ]])], |
| 114 |
+ [AC_DEFINE(HAVE_FLOCK_T, 1, [if you have flock_t]) |
| 115 |
-+ AC_MSG_RESULT("yes")], |
| 116 |
-+ [AC_MSG_RESULT("no") ]) |
| 117 |
++ AC_MSG_RESULT([yes])], |
| 118 |
++ [AC_MSG_RESULT([no]) ]) |
| 119 |
+ |
| 120 |
+if test "$HAVE_FLOCK_T" != 1; then |
| 121 |
++ AC_MSG_CHECKING([for flock_t in sys/flock.h]) |
| 122 |
+ AC_COMPILE_IFELSE([ |
| 123 |
+ AC_LANG_PROGRAM([[ |
| 124 |
+#include <sys/flock.h> |
| 125 |
@@ -111,8 +136,8 @@ |
| 126 |
+flock_t filler; |
| 127 |
+ ]])], |
| 128 |
+ [AC_DEFINE(HAVE_FLOCK_T, 1, [if you have flock_t]) |
| 129 |
-+ AC_MSG_RESULT("yes")], |
| 130 |
-+ [AC_MSG_RESULT("no") ]) |
| 131 |
++ AC_MSG_RESULT([yes])], |
| 132 |
++ [AC_MSG_RESULT([no]) ]) |
| 133 |
+fi |
| 134 |
+ |
| 135 |
+# check for union semun type |
| 136 |
@@ -128,40 +153,56 @@ |
| 137 |
+dnl this quick check will add -lm to LIBS |
| 138 |
+AC_CHECK_LIB(m, cos) |
| 139 |
+ |
| 140 |
-+AC_ARG_WITH(gsiftp-flavour, |
| 141 |
-+ [ --with-gsiftp-flavour[[=PATH]] Enable Globus Toolkit gsiftp protocol support ], |
| 142 |
-+ [ if test "x$withval" != "xno"; then |
| 143 |
-+ |
| 144 |
-+ if test "x$withval" != "xyes" ; then |
| 145 |
-+ GSIFTP_FLAVOUR=${withval} |
| 146 |
-+ fi |
| 147 |
-+ AC_DEFINE(GSIFTP_FLAVOUR, [1], |
| 148 |
++AC_ARG_WITH([gsiftp-flavour], |
| 149 |
++ [AC_HELP_STRING([--with-gsiftp-flavour[=PATH]], [Compile with a given Globus Toolkit gsiftp protocol flavour])], |
| 150 |
++ , |
| 151 |
++ [withval=no]) |
| 152 |
++ |
| 153 |
++case x$withval in |
| 154 |
++ xno) |
| 155 |
++ AC_MSG_CHECKING([for Globus flavor]) |
| 156 |
++ AC_MSG_RESULT([none]) |
| 157 |
++ ;; |
| 158 |
++ xyes) |
| 159 |
++ AC_MSG_RESULT([yes]) |
| 160 |
++ ;; |
| 161 |
++ *) |
| 162 |
++ AC_MSG_RESULT([$withval]) |
| 163 |
++ GSIFTP_FLAVOUR=$withval |
| 164 |
++ AC_DEFINE(GSIFTP_FLAVOUR, [1], |
| 165 |
+ [Define to 1 if you want Globus Toolkit architecture]) |
| 166 |
-+ fi |
| 167 |
-+ ] |
| 168 |
-+) |
| 169 |
++ ;; |
| 170 |
++esac |
| 171 |
+ |
| 172 |
+AC_ARG_WITH(gsiftp, |
| 173 |
-+ [ --with-gsiftp[[=PATH]] Enable Globus Toolkit gsiftp protocol support ], |
| 174 |
-+ [ if test "x$withval" != "xno"; then |
| 175 |
-+ if test "x$withval" != "xyes" ; then |
| 176 |
-+ CPPFLAGS_GLOBUS="-I${withval}/include/${GSIFTP_FLAVOUR}" |
| 177 |
-+ LIBS_GLOBUS="-L${withval}/lib -lglobus_ftp_client_${GSIFTP_FLAVOUR}" |
| 178 |
-+ HAVE_GSIFTP=yes |
| 179 |
-+ fi |
| 180 |
-+ AC_DEFINE(HAVE_GSIFTP, [1], |
| 181 |
++ [AC_HELP_STRING([--with-gsiftp[=PATH]], [Compile with Globus Toolkit gsiftp protocol support [default=no]])], |
| 182 |
++ , |
| 183 |
++ [withval=no]) |
| 184 |
++case "x$withval" in |
| 185 |
++ xno) |
| 186 |
++ AC_MSG_CHECKING([for Globus Toolkit]) |
| 187 |
++ AC_MSG_RESULT([no]) |
| 188 |
++ ;; |
| 189 |
++ xyes) |
| 190 |
++ AC_MSG_RESULT([yes]) |
| 191 |
++ ;; |
| 192 |
++ *) |
| 193 |
++ AC_MSG_RESULT([yes]) |
| 194 |
++ CPPFLAGS_GLOBUS="-I${withval}/include/${GSIFTP_FLAVOUR}" |
| 195 |
++ LIBS_GLOBUS="-L${withval}/lib -lglobus_ftp_client_${GSIFTP_FLAVOUR}" |
| 196 |
++ HAVE_GSIFTP=yes |
| 197 |
++ AC_DEFINE(HAVE_GSIFTP, [1], |
| 198 |
+ [Define if you want Globus Toolkit gsiftp protocol support]) |
| 199 |
-+ fi |
| 200 |
-+ ] |
| 201 |
-+) |
| 202 |
++ ;; |
| 203 |
++esac |
| 204 |
+ |
| 205 |
+AC_SUBST(CPPFLAGS_GLOBUS) |
| 206 |
+AC_SUBST(LIBS_GLOBUS) |
| 207 |
+AC_CONFIG_FILES([Makefile cfitsio.pc]) |
| 208 |
+AC_OUTPUT |
| 209 |
---- Makefile.am.absent 1970-01-01 01:00:00.000000000 +0100 |
| 210 |
-+++ Makefile.am 2008-06-02 01:07:45.000000000 +0100 |
| 211 |
-@@ -0,0 +1,81 @@ |
| 212 |
+--- Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 |
| 213 |
++++ Makefile.am 2009-08-20 00:45:37.000000000 +0100 |
| 214 |
+@@ -0,0 +1,86 @@ |
| 215 |
+lib_LTLIBRARIES = libcfitsio.la |
| 216 |
+ |
| 217 |
+C_SOURCES = \ |
| 218 |
@@ -184,6 +225,9 @@ |
| 219 |
+AM_YFLAGS = -d -v |
| 220 |
+ |
| 221 |
+include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h |
| 222 |
++noinst_HEADERS = cfortran.h drvrgsiftp.h eval_defs.h f77_wrap.h group.h \ |
| 223 |
++ compress.h eval_tab.h fpack.h grparser.h region.h |
| 224 |
++ |
| 225 |
+libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS) |
| 226 |
+libcfitsio_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ |
| 227 |
+libcfitsio_la_CPPFLAGS = @CPPFLAGS_FORTRAN@ @CPPFLAGS_EXTRA@ @CPPFLAGS_GLOBUS@ |
| 228 |
@@ -214,6 +258,8 @@ |
| 229 |
+testf77_SOURCES = testf77.f |
| 230 |
+endif |
| 231 |
+ |
| 232 |
++EXTRA_DIST = README README.MacOS README.win32 License.txt changes.txt cfitsio.doc fitsio.doc cfitsio.tex fitsio.tex quick.tex |
| 233 |
++ |
| 234 |
+check-local: $(check_PROGRAMS) |
| 235 |
+ @total=0; failed=0; \ |
| 236 |
+ for i in $(check_PROGRAMS); do \ |
| 237 |
@@ -243,21 +289,3 @@ |
| 238 |
+ sed -e 's/yy/ff/g' -e 's/YY/FF/g' y.tab.c > eval_y.c; \ |
| 239 |
+ sed -e 's/yy/ff/g' -e 's/YY/FF/g' y.tab.h > eval_tab.h; \ |
| 240 |
+ rm -f y.tab.c y.tab.h |
| 241 |
---- cfitsio.pc.in.orig 2008-06-02 01:20:50.000000000 +0100 |
| 242 |
-+++ cfitsio.pc.in 2008-06-02 01:22:14.000000000 +0100 |
| 243 |
-@@ -1,10 +1,10 @@ |
| 244 |
- prefix=@prefix@ |
| 245 |
- exec_prefix=@exec_prefix@ |
| 246 |
--libdir=${exec_prefix}/lib |
| 247 |
--includedir=${prefix}/include |
| 248 |
-+libdir=@libdir@ |
| 249 |
-+includedir=@includedir@ |
| 250 |
- |
| 251 |
--Name: cfitsio |
| 252 |
-+Name: @PACKAGE_NAME@ |
| 253 |
- Description: FITS File Subroutine Library |
| 254 |
--Version: 3.006 |
| 255 |
--Libs: -L${libdir} -lcfitsio @LIBS@ -lm |
| 256 |
-+Version: @PACKAGE_VERSION@ |
| 257 |
-+Libs: -L${libdir} -lcfitsio @LIBS@ |
| 258 |
- Cflags: -I${includedir} |
Archives