| 1 |
bicatali 09/07/28 17:08:38 |
| 2 |
|
| 3 |
Added: scamp-1.5.5-autotools.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: scamp-1.5.5-autotools.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.ac.orig 2009-04-10 20:22:36.000000000 +0100 |
| 17 |
+++ configure.ac 2009-07-28 17:50:01.000000000 +0100 |
| 18 |
@@ -24,39 +24,19 @@ |
| 19 |
sinclude(acx_cdsclient.m4) |
| 20 |
sinclude(acx_fftw.m4) |
| 21 |
sinclude(acx_plplot.m4) |
| 22 |
-sinclude(acx_prog_cc_optim.m4) |
| 23 |
sinclude(acx_pthread.m4) |
| 24 |
sinclude(acx_urbi_resolve_dir.m4) |
| 25 |
|
| 26 |
# Display pakage and version number |
| 27 |
AC_MSG_RESULT([******** Configuring: $PACKAGE_NAME $VERSION ($date) ********]) |
| 28 |
|
| 29 |
-# Initialize the list of compilers to consider |
| 30 |
-cclist="cc gcc" |
| 31 |
-# Backup and reset the input CFLAGS |
| 32 |
-mycflags="$CFLAGS" |
| 33 |
-CFLAGS="" |
| 34 |
- |
| 35 |
-# Provide special option for the Linux Intel C compiler |
| 36 |
-AC_MSG_CHECKING([for Linux Intel C compiler mode]) |
| 37 |
-AC_ARG_ENABLE(icc, |
| 38 |
- [AC_HELP_STRING([--enable-icc], |
| 39 |
- [Enable special mode for compilation with the Intel compiler \ |
| 40 |
-(off by default)])], |
| 41 |
- use_icc="yes" |
| 42 |
- cclist="icc $cclist" |
| 43 |
- AC_MSG_RESULT([yes]), |
| 44 |
- use_icc="no" |
| 45 |
- AC_MSG_RESULT([no])) |
| 46 |
- |
| 47 |
# Checks for programs. |
| 48 |
# GCC is chosen last because it is likely to yield less optimized code |
| 49 |
AC_LANG(C) |
| 50 |
-AC_PROG_CC([$cclist]) |
| 51 |
+AC_PROG_CC |
| 52 |
# C Compiler: Check that it is ANSI C and POSIX-compliant |
| 53 |
AM_PROG_CC_STDC |
| 54 |
AC_ISC_POSIX |
| 55 |
-ACX_PROG_CC_OPTIM |
| 56 |
AC_DISABLE_STATIC |
| 57 |
#AC_DISABLE_SHARED |
| 58 |
AC_PROG_LIBTOOL |
| 59 |
@@ -273,11 +253,6 @@ |
| 60 |
|
| 61 |
# Link with gprof option |
| 62 |
if test "$use_gprof" = "yes"; then |
| 63 |
- if test "$use_icc" = "yes"; then |
| 64 |
- CFLAGS="$CFLAGS -pq" |
| 65 |
- else |
| 66 |
- CFLAGS="$CFLAGS -pg" |
| 67 |
- fi |
| 68 |
use_static="no" |
| 69 |
fi |
| 70 |
|
| 71 |
--- src/Makefile.am.orig 2009-04-09 10:00:38.000000000 +0100 |
| 72 |
+++ src/Makefile.am 2009-07-28 17:54:16.000000000 +0100 |
| 73 |
@@ -15,6 +15,8 @@ |
| 74 |
define.h fft.h fgroup.h field.h fitswcs.h globals.h header.h \ |
| 75 |
key.h match.h misc.h mosaic.h photsolve.h preflist.h prefs.h \ |
| 76 |
proper.h samples.h threads.h types.h wcscelsys.h xml.h |
| 77 |
+scamp_CPPFLAGS = @PLPLOT_CFLAGS@ |
| 78 |
scamp_LDADD = $(top_builddir)/src/fits/libfits.a \ |
| 79 |
- $(top_builddir)/src/wcs/libwcs_c.a |
| 80 |
+ $(top_builddir)/src/wcs/libwcs_c.a \ |
| 81 |
+ @PLPLOT_LIBS@ |
| 82 |
DATE=`date +"%Y-%m-%d"` |
Archives