[31190] branches/release_1_6/base
jmpp at macports.org
jmpp at macports.org
Sat Nov 17 20:33:38 PST 2007
Revision: 31190
http://trac.macosforge.org/projects/macports/changeset/31190
Author: jmpp at macports.org
Date: 2007-11-17 20:33:36 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Merged revisions 31129-31186 via svnmerge from
http://svn.macports.org/repository/macports/trunk/base
........
r31139 | jberry at macports.org | 2007-11-16 18:24:16 -0400 (Fri, 16 Nov 2007) | 1 line
Disable readline support by default. Configure with --enable-readline to enable readline support.
........
r31140 | jberry at macports.org | 2007-11-16 18:25:54 -0400 (Fri, 16 Nov 2007) | 1 line
reconfigure after disable of readline in r31139.
........
r31141 | jberry at macports.org | 2007-11-16 18:28:43 -0400 (Fri, 16 Nov 2007) | 1 line
Add note about enabling readine to ChangeLog
........
r31152 | nox at macports.org | 2007-11-16 22:49:03 -0400 (Fri, 16 Nov 2007) | 2 lines
portconfigure: Whitespace changes, added modeline.
........
r31161 | jmpp at macports.org | 2007-11-17 01:00:15 -0400 (Sat, 17 Nov 2007) | 1 line
typo, 's/readine/readline/'.
........
Modified Paths:
--------------
branches/release_1_6/base/ChangeLog
branches/release_1_6/base/configure
branches/release_1_6/base/configure.ac
branches/release_1_6/base/src/port1.0/portconfigure.tcl
Property Changed:
----------------
branches/release_1_6/base/
Property changes on: branches/release_1_6/base
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/base:1-31128
+ /trunk/base:1-31186
Modified: branches/release_1_6/base/ChangeLog
===================================================================
--- branches/release_1_6/base/ChangeLog 2007-11-18 04:04:00 UTC (rev 31189)
+++ branches/release_1_6/base/ChangeLog 2007-11-18 04:33:36 UTC (rev 31190)
@@ -6,6 +6,10 @@
Unreleased:
+ - readline is now disabled by default, in order to avoid support issues.
+ use --enable-readine parameter to configure to enable support for readine.
+ (jberry r31139, r31140).
+
- daemondo now monitors kevents for the death of the daemon process, which means that it
now detects the death of processes (even those that aren't direct child processes)
much more reliably. Plus other daemondo logging and doc cleanups.
Modified: branches/release_1_6/base/configure
===================================================================
--- branches/release_1_6/base/configure 2007-11-18 04:04:00 UTC (rev 31189)
+++ branches/release_1_6/base/configure 2007-11-18 04:33:36 UTC (rev 31190)
@@ -1377,6 +1377,8 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-werror Add -Werror to CFLAGS. Used for development.
+ --enable-readline Enable addition of readline support, if readline
+ present.
--enable-shared build and link with shared libraries --enable-shared
Optional Packages:
@@ -10738,7 +10740,10 @@
# Check for readline
-{ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+# Check whether --enable-readline was given.
+if test "${enable_readline+set}" = set; then
+ enableval=$enable_readline;
+ { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
if test "${ac_cv_lib_readline_readline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10801,7 +10806,7 @@
echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
if test $ac_cv_lib_readline_readline = yes; then
- READLINE_LIBS=-lreadline
+ READLINE_LIBS=-lreadline
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBREADLINE 1
@@ -10810,7 +10815,7 @@
fi
-{ echo "$as_me:$LINENO: checking whether rl_username_completion_function is declared" >&5
+ { echo "$as_me:$LINENO: checking whether rl_username_completion_function is declared" >&5
echo $ECHO_N "checking whether rl_username_completion_function is declared... $ECHO_C" >&6; }
if test "${ac_cv_have_decl_rl_username_completion_function+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10822,10 +10827,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
int
@@ -10894,10 +10899,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
int
@@ -10966,10 +10971,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
int
@@ -11038,10 +11043,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
int
@@ -11110,10 +11115,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
int
@@ -11182,10 +11187,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
int
@@ -11245,7 +11250,10 @@
+fi
+
+
# Lowest non-system-reserved uid and gid (Apple claims <500)
cat >>confdefs.h <<\_ACEOF
Modified: branches/release_1_6/base/configure.ac
===================================================================
--- branches/release_1_6/base/configure.ac 2007-11-18 04:04:00 UTC (rev 31189)
+++ branches/release_1_6/base/configure.ac 2007-11-18 04:33:36 UTC (rev 31190)
@@ -158,16 +158,19 @@
MP_CHECK_X11
# Check for readline
-AC_CHECK_LIB([readline], [readline], [
- READLINE_LIBS=-lreadline
- AC_DEFINE([HAVE_LIBREADLINE], [1], [Define to 1 if you have the `readline' library (-lreadline).])
- ])
-AC_CHECK_DECLS([rl_username_completion_function,rl_filename_completion_function,rl_completion_matches,username_completion_function,filename_completion_function,completion_matches], [], [],
+AC_ARG_ENABLE(readline, AC_HELP_STRING([--enable-readline], [Enable addition of readline support, if readline present.]),
[
-#include <stdio.h>
-#if HAVE_READLINE_READLINE_H
-# include <readline/readline.h>
-#endif
+ AC_CHECK_LIB([readline], [readline], [
+ READLINE_LIBS=-lreadline
+ AC_DEFINE([HAVE_LIBREADLINE], [1], [Define to 1 if you have the `readline' library (-lreadline).])
+ ])
+ AC_CHECK_DECLS([rl_username_completion_function,rl_filename_completion_function,rl_completion_matches,username_completion_function,filename_completion_function,completion_matches], [], [],
+ [
+ #include <stdio.h>
+ #if HAVE_READLINE_READLINE_H
+ # include <readline/readline.h>
+ #endif
+ ])
])
AC_SUBST(READLINE_LIBS)
Modified: branches/release_1_6/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/release_1_6/base/src/port1.0/portconfigure.tcl 2007-11-18 04:04:00 UTC (rev 31189)
+++ branches/release_1_6/base/src/port1.0/portconfigure.tcl 2007-11-18 04:33:36 UTC (rev 31190)
@@ -1,4 +1,4 @@
-# et:ts=4
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
# portconfigure.tcl
# $Id$
#
@@ -42,42 +42,42 @@
# define options
commands configure automake autoconf xmkmf libtool
# defaults
-default configure.env ""
-default configure.pre_args {--prefix=${prefix}}
-default configure.cmd ./configure
-default configure.dir {${worksrcpath}}
-default autoconf.dir {${worksrcpath}}
-default automake.dir {${worksrcpath}}
-default xmkmf.cmd xmkmf
-default xmkmf.dir {${worksrcpath}}
-default use_configure yes
+default configure.env ""
+default configure.pre_args {--prefix=${prefix}}
+default configure.cmd ./configure
+default configure.dir {${worksrcpath}}
+default autoconf.dir {${worksrcpath}}
+default automake.dir {${worksrcpath}}
+default xmkmf.cmd xmkmf
+default xmkmf.dir {${worksrcpath}}
+default use_configure yes
# Configure special environment variables.
# We could have default debug/optimization flags at some point.
# compiler flags section
options configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath
-default configure.pipe {${configurepipe}}
-default configure.cflags {-O2}
-default configure.cppflags {"-I${prefix}/include"}
-default configure.cxxflags {-O2}
-default configure.objcflags {-O2}
-default configure.ldflags {"-L${prefix}/lib"}
-default configure.libs {}
-default configure.fflags {-O2}
-default configure.f90flags {-O2}
-default configure.fcflags {-O2}
-default configure.classpath {}
+default configure.pipe {${configurepipe}}
+default configure.cflags {-O2}
+default configure.cppflags {"-I${prefix}/include"}
+default configure.cxxflags {-O2}
+default configure.objcflags {-O2}
+default configure.ldflags {"-L${prefix}/lib"}
+default configure.libs {}
+default configure.fflags {-O2}
+default configure.f90flags {-O2}
+default configure.fcflags {-O2}
+default configure.classpath {}
# tools section
options configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
-default configure.perl {}
-default configure.python {}
-default configure.ruby {}
-default configure.install {"/usr/bin/install"}
-default configure.awk {}
-default configure.bison {}
-default configure.pkg_config {}
-default configure.pkg_config_path {}
+default configure.perl {}
+default configure.python {}
+default configure.ruby {}
+default configure.install {"/usr/bin/install"}
+default configure.awk {}
+default configure.bison {}
+default configure.pkg_config {}
+default configure.pkg_config_path {}
# Universal options & default values.
if {[file exists /Developer/SDKs/MacOSX10.5.sdk]} {
@@ -85,26 +85,26 @@
} else {
set sysroot "/Developer/SDKs/MacOSX10.4u.sdk"
}
-options configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags configure.universal_env
-default configure.universal_args --disable-dependency-tracking
-default configure.universal_cflags {"-isysroot $sysroot -arch i386 -arch ppc"}
-default configure.universal_cppflags {}
-default configure.universal_cxxflags {"-isysroot $sysroot -arch i386 -arch ppc"}
-default configure.universal_ldflags {"-arch i386 -arch ppc"}
+options configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags configure.universal_env
+default configure.universal_args --disable-dependency-tracking
+default configure.universal_cflags {"-isysroot $sysroot -arch i386 -arch ppc"}
+default configure.universal_cppflags {}
+default configure.universal_cxxflags {"-isysroot $sysroot -arch i386 -arch ppc"}
+default configure.universal_ldflags {"-arch i386 -arch ppc"}
# Select a distinct compiler (C, C preprocessor, C++)
options configure.ccache configure.distcc configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler
-default configure.ccache {${configureccache}}
-default configure.distcc {${configuredistcc}}
-default configure.cc {}
-default configure.cxx {}
-default configure.cpp {}
-default configure.objc {}
-default configure.f77 {}
-default configure.f90 {}
-default configure.fc {}
-default configure.javac {}
-default configure.compiler {}
+default configure.ccache {${configureccache}}
+default configure.distcc {${configuredistcc}}
+default configure.cc {}
+default configure.cxx {}
+default configure.cpp {}
+default configure.objc {}
+default configure.f77 {}
+default configure.f90 {}
+default configure.fc {}
+default configure.javac {}
+default configure.compiler {}
set_ui_prefix
@@ -148,17 +148,17 @@
global os.platform os.major
if {[tbool use_automake]} {
- # XXX depend on automake
- if {[catch {command_exec automake} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] automake $result]"
- }
+ # XXX depend on automake
+ if {[catch {command_exec automake} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] automake $result]"
+ }
}
if {[tbool use_autoconf]} {
- # XXX depend on autoconf
- if {[catch {command_exec autoconf} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] autoconf $result]"
- }
+ # XXX depend on autoconf
+ if {[catch {command_exec autoconf} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] autoconf $result]"
+ }
}
# 1st chose a reasonable default compiler suite for each platform if none was chosen
@@ -244,69 +244,69 @@
}
if {[tbool use_xmkmf]} {
- # XXX depend on xmkmf
- if {[catch {command_exec xmkmf} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]"
- } else {
- # XXX should probably use make command abstraction but we know that
- # X11 will already set things up so that "make Makefiles" always works.
- system "cd ${worksrcpath} && make Makefiles"
- }
- } elseif {[tbool use_configure]} {
- # Merge (ld|c|cpp|cxx)flags into the environment variable.
- parse_environment configure
+ # XXX depend on xmkmf
+ if {[catch {command_exec xmkmf} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] xmkmf $result]"
+ } else {
+ # XXX should probably use make command abstraction but we know that
+ # X11 will already set things up so that "make Makefiles" always works.
+ system "cd ${worksrcpath} && make Makefiles"
+ }
+ } elseif {[tbool use_configure]} {
+ # Merge (ld|c|cpp|cxx)flags into the environment variable.
+ parse_environment configure
- # Set pre-compiler filter to use (ccache/distcc), if any.
- if {[tbool configure.ccache] && [tbool configure.distcc]} {
- set filter "ccache "
- append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
- } elseif {[tbool configure.ccache]} {
- set filter "ccache "
- } elseif {[tbool configure.distcc]} {
- set filter "distcc "
- } else {
- set filter ""
- }
-
- # Set flags controlling the kind of compiler output.
- if {[tbool configure.pipe]} {
- set output "-pipe "
- } else {
- set output ""
- }
+ # Set pre-compiler filter to use (ccache/distcc), if any.
+ if {[tbool configure.ccache] && [tbool configure.distcc]} {
+ set filter "ccache "
+ append_list_to_environment_value configure "CCACHE_PREFIX" "distcc"
+ } elseif {[tbool configure.ccache]} {
+ set filter "ccache "
+ } elseif {[tbool configure.distcc]} {
+ set filter "distcc "
+ } else {
+ set filter ""
+ }
+
+ # Set flags controlling the kind of compiler output.
+ if {[tbool configure.pipe]} {
+ set output "-pipe "
+ } else {
+ set output ""
+ }
- # Append configure flags.
- append_list_to_environment_value configure "CC" ${filter}${configure.cc}
- append_list_to_environment_value configure "CPP" ${filter}${configure.cpp}
- append_list_to_environment_value configure "CXX" ${filter}${configure.cxx}
- append_list_to_environment_value configure "OBJC" ${filter}${configure.objc}
- append_list_to_environment_value configure "FC" ${configure.fc}
- append_list_to_environment_value configure "F77" ${configure.f77}
- append_list_to_environment_value configure "F90" ${configure.f90}
- append_list_to_environment_value configure "JAVAC" ${configure.javac}
- append_list_to_environment_value configure "CFLAGS" ${output}${configure.cflags}
- append_list_to_environment_value configure "CPPFLAGS" ${configure.cppflags}
- append_list_to_environment_value configure "CXXFLAGS" ${output}${configure.cxxflags}
- append_list_to_environment_value configure "OBJCFLAGS" ${output}${configure.objcflags}
- append_list_to_environment_value configure "LDFLAGS" ${configure.ldflags}
- append_list_to_environment_value configure "LIBS" ${configure.libs}
- append_list_to_environment_value configure "FFLAGS" ${output}${configure.fflags}
- append_list_to_environment_value configure "F90FLAGS" ${output}${configure.f90flags}
- append_list_to_environment_value configure "FCFLAGS" ${output}${configure.fcflags}
- append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
- append_list_to_environment_value configure "PERL" ${configure.perl}
- append_list_to_environment_value configure "PYTHON" ${configure.python}
- append_list_to_environment_value configure "RUBY" ${configure.ruby}
- append_list_to_environment_value configure "INSTALL" ${configure.install}
- append_list_to_environment_value configure "AWK" ${configure.awk}
- append_list_to_environment_value configure "BISON" ${configure.bison}
- append_list_to_environment_value configure "PKG_CONFIG" ${configure.pkg_config}
- append_list_to_environment_value configure "PKG_CONFIG_PATH" ${configure.pkg_config_path}
+ # Append configure flags.
+ append_list_to_environment_value configure "CC" ${filter}${configure.cc}
+ append_list_to_environment_value configure "CPP" ${filter}${configure.cpp}
+ append_list_to_environment_value configure "CXX" ${filter}${configure.cxx}
+ append_list_to_environment_value configure "OBJC" ${filter}${configure.objc}
+ append_list_to_environment_value configure "FC" ${configure.fc}
+ append_list_to_environment_value configure "F77" ${configure.f77}
+ append_list_to_environment_value configure "F90" ${configure.f90}
+ append_list_to_environment_value configure "JAVAC" ${configure.javac}
+ append_list_to_environment_value configure "CFLAGS" ${output}${configure.cflags}
+ append_list_to_environment_value configure "CPPFLAGS" ${configure.cppflags}
+ append_list_to_environment_value configure "CXXFLAGS" ${output}${configure.cxxflags}
+ append_list_to_environment_value configure "OBJCFLAGS" ${output}${configure.objcflags}
+ append_list_to_environment_value configure "LDFLAGS" ${configure.ldflags}
+ append_list_to_environment_value configure "LIBS" ${configure.libs}
+ append_list_to_environment_value configure "FFLAGS" ${output}${configure.fflags}
+ append_list_to_environment_value configure "F90FLAGS" ${output}${configure.f90flags}
+ append_list_to_environment_value configure "FCFLAGS" ${output}${configure.fcflags}
+ append_list_to_environment_value configure "CLASSPATH" ${configure.classpath}
+ append_list_to_environment_value configure "PERL" ${configure.perl}
+ append_list_to_environment_value configure "PYTHON" ${configure.python}
+ append_list_to_environment_value configure "RUBY" ${configure.ruby}
+ append_list_to_environment_value configure "INSTALL" ${configure.install}
+ append_list_to_environment_value configure "AWK" ${configure.awk}
+ append_list_to_environment_value configure "BISON" ${configure.bison}
+ append_list_to_environment_value configure "PKG_CONFIG" ${configure.pkg_config}
+ append_list_to_environment_value configure "PKG_CONFIG_PATH" ${configure.pkg_config_path}
- # Execute the command (with the new environment).
- if {[catch {command_exec configure} result]} {
- return -code error "[format [msgcat::mc "%s failure: %s"] configure $result]"
- }
+ # Execute the command (with the new environment).
+ if {[catch {command_exec configure} result]} {
+ return -code error "[format [msgcat::mc "%s failure: %s"] configure $result]"
+ }
}
return 0
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071117/a0d9b66e/attachment-0001.html
More information about the macports-changes
mailing list