| 1 |
bicatali 09/07/28 17:39:02 |
| 2 |
|
| 3 |
Added: sextractor-configure.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/sextractor/files/sextractor-configure.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/sextractor/files/sextractor-configure.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/sextractor/files/sextractor-configure.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: sextractor-configure.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.ac.orig 2009-04-09 14:28:38.000000000 +0100 |
| 17 |
+++ configure.ac 2009-07-28 18:25:38.000000000 +0100 |
| 18 |
@@ -22,42 +22,19 @@ |
| 19 |
# Include macros |
| 20 |
sinclude(acx_atlas.m4) |
| 21 |
sinclude(acx_fftw.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 $VERSION ($date) **********]) |
| 28 |
|
| 29 |
-# Initialize the list of compilers to consider |
| 30 |
-cclist="cc gcc" |
| 31 |
- |
| 32 |
-# Backup and reset the input CFLAGS and LDFLAGS |
| 33 |
-mycflags="$CFLAGS" |
| 34 |
-CFLAGS="" |
| 35 |
-myldflags="$LDFLAGS" |
| 36 |
-LDFLAGS="" |
| 37 |
- |
| 38 |
-# Provide special option for the Linux Intel C compiler |
| 39 |
-AC_MSG_CHECKING([for Linux Intel C compiler mode]) |
| 40 |
-AC_ARG_ENABLE(icc, |
| 41 |
- [AC_HELP_STRING([--enable-icc], |
| 42 |
- [Enable special mode for compilation with the Intel compiler \ |
| 43 |
-(off by default)])], |
| 44 |
- use_icc="yes" |
| 45 |
- cclist="icc $cclist" |
| 46 |
- AC_MSG_RESULT([yes]), |
| 47 |
- use_icc="no" |
| 48 |
- AC_MSG_RESULT([no])) |
| 49 |
- |
| 50 |
# Checks for programs. |
| 51 |
# GCC is chosen last because it is likely to yield less optimized code |
| 52 |
AC_LANG(C) |
| 53 |
-AC_PROG_CC([$cclist]) |
| 54 |
+AC_PROG_CC |
| 55 |
# C Compiler: Check that it is ANSI C and POSIX-compliant |
| 56 |
AM_PROG_CC_STDC |
| 57 |
AC_ISC_POSIX |
| 58 |
-ACX_PROG_CC_OPTIM |
| 59 |
AC_DISABLE_STATIC |
| 60 |
#AC_DISABLE_SHARED |
| 61 |
AC_PROG_LIBTOOL |
| 62 |
@@ -160,17 +137,6 @@ |
| 63 |
use_gprof="no" |
| 64 |
AC_MSG_RESULT([no])) |
| 65 |
|
| 66 |
-# Enable static linking |
| 67 |
-AC_MSG_CHECKING([static linking]) |
| 68 |
-AC_ARG_ENABLE(static, |
| 69 |
- [AC_HELP_STRING([--enable-static], |
| 70 |
- [Enable static linking \ |
| 71 |
-(off by default)])], |
| 72 |
- use_static="yes" |
| 73 |
- AC_MSG_RESULT([yes]), |
| 74 |
- use_static="no" |
| 75 |
- AC_MSG_RESULT([no])) |
| 76 |
- |
| 77 |
################# Actions to complete in case of multhreading ################ |
| 78 |
AC_DEFINE_UNQUOTED(THREADS_NMAX, $n_pthreads,[Maximum number of POSIX threads]) |
| 79 |
if test "$use_pthreads" = "yes"; then |
| 80 |
@@ -205,19 +171,9 @@ |
| 81 |
|
| 82 |
# Link with gprof option |
| 83 |
if test "$use_gprof" = "yes"; then |
| 84 |
- if test "$use_icc" = "yes"; then |
| 85 |
- CFLAGS="$CFLAGS -pq" |
| 86 |
- else |
| 87 |
- CFLAGS="$CFLAGS -pg" |
| 88 |
- fi |
| 89 |
use_static="no" |
| 90 |
fi |
| 91 |
|
| 92 |
-# Static linking option |
| 93 |
-if test "$use_static" = "yes"; then |
| 94 |
- LDFLAGS="-static -shared-libgcc $LDFLAGS" |
| 95 |
-fi |
| 96 |
- |
| 97 |
# Override automatic CFLAGS and LDFLAGS with those of user |
| 98 |
#if test -n "$mycflags"; then |
| 99 |
#CFLAGS="$mycflags" |
Archives