Merge from gcc:
+2007-03-01 Brooks Moses <brooks.moses@codesourcery.com> + + * configure.ac: Add "--with-pdfdir" configure option, + which defines pdfdir variable. + * Makefile.def (target=fixincludes): Add install-pdf to + missing targets. + (recursive_targets): Add install-pdf target. + (flags_to_pass): Add pdfdir. + * Makefile.tpl: Add pdfdir handling, add do-install-pdf + target. + * configure: Regenerate + * Makefile.in: Regenerate + +2007-02-28 Eric Christopher <echristo@apple.com> + + Revert: + 2006-12-07 Mike Stump <mrs@apple.com> + + * Makefile.def (dependencies): Add dependency for + install-target-libssp and install-target-libgomp on + install-gcc. + * Makefile.in: Regenerate. + +2007-02-27 Matt Kraai <kraai@ftbfs.org> + + * configure: Regenerate. + * configure.ac: Move statements after variable declarations. +
This commit is contained in:
DJ Delorie
parent
3315e811a4
commit
d4954b6d11
28
ChangeLog
28
ChangeLog
|
|
@ -1,3 +1,31 @@
|
|||
2007-03-01 Brooks Moses <brooks.moses@codesourcery.com>
|
||||
|
||||
* configure.ac: Add "--with-pdfdir" configure option,
|
||||
which defines pdfdir variable.
|
||||
* Makefile.def (target=fixincludes): Add install-pdf to
|
||||
missing targets.
|
||||
(recursive_targets): Add install-pdf target.
|
||||
(flags_to_pass): Add pdfdir.
|
||||
* Makefile.tpl: Add pdfdir handling, add do-install-pdf
|
||||
target.
|
||||
* configure: Regenerate
|
||||
* Makefile.in: Regenerate
|
||||
|
||||
2007-02-28 Eric Christopher <echristo@apple.com>
|
||||
|
||||
Revert:
|
||||
2006-12-07 Mike Stump <mrs@apple.com>
|
||||
|
||||
* Makefile.def (dependencies): Add dependency for
|
||||
install-target-libssp and install-target-libgomp on
|
||||
install-gcc.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2007-02-27 Matt Kraai <kraai@ftbfs.org>
|
||||
|
||||
* configure: Regenerate.
|
||||
* configure.ac: Move statements after variable declarations.
|
||||
|
||||
2007-02-19 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
* configure.ac: Adjust for loop syntax.
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ host_modules= { module= fixincludes;
|
|||
missing= dvi;
|
||||
missing= pdf;
|
||||
missing= TAGS;
|
||||
missing= install-pdf;
|
||||
missing= install-info;
|
||||
missing= installcheck; };
|
||||
host_modules= { module= flex; no_check_cross= true; };
|
||||
|
|
@ -166,6 +167,9 @@ recursive_targets = { make_target= TAGS;
|
|||
recursive_targets = { make_target= install-info;
|
||||
depend=configure;
|
||||
depend=info; };
|
||||
recursive_targets = { make_target= install-pdf;
|
||||
depend=configure;
|
||||
depend=pdf; };
|
||||
recursive_targets = { make_target= install-html;
|
||||
depend=configure;
|
||||
depend=html; };
|
||||
|
|
@ -189,6 +193,7 @@ flags_to_pass = { flag= includedir ; };
|
|||
flags_to_pass = { flag= datarootdir ; };
|
||||
flags_to_pass = { flag= docdir ; };
|
||||
flags_to_pass = { flag= infodir ; };
|
||||
flags_to_pass = { flag= pdfdir ; };
|
||||
flags_to_pass = { flag= htmldir ; };
|
||||
flags_to_pass = { flag= libdir ; };
|
||||
flags_to_pass = { flag= libexecdir ; };
|
||||
|
|
@ -484,10 +489,6 @@ dependencies = { module=all-target-libobjc; on=all-target-libiberty; };
|
|||
dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
|
||||
dependencies = { module=all-target-libstdc++-v3; on=all-target-libiberty; };
|
||||
|
||||
// Target libraries installed under gcc need to be installed before gcc
|
||||
dependencies = { module=install-target-libssp; on=install-gcc; };
|
||||
dependencies = { module=install-target-libgomp; on=install-gcc; };
|
||||
|
||||
// Target modules in the 'src' repository.
|
||||
lang_env_dependencies = { module=examples; };
|
||||
lang_env_dependencies = { module=libtermcap; };
|
||||
|
|
|
|||
2542
Makefile.in
2542
Makefile.in
File diff suppressed because it is too large
Load Diff
|
|
@ -61,6 +61,7 @@ oldincludedir = @oldincludedir@
|
|||
infodir = @infodir@
|
||||
datarootdir = @datarootdir@
|
||||
docdir = @docdir@
|
||||
pdfdir = @pdfdir@
|
||||
htmldir = @htmldir@
|
||||
mandir = @mandir@
|
||||
man1dir = $(mandir)/man1
|
||||
|
|
@ -570,7 +571,8 @@ do-[+make_target+]:
|
|||
|
||||
# Here are the targets which correspond to the do-X targets.
|
||||
|
||||
.PHONY: info installcheck dvi pdf html install-info install-html
|
||||
.PHONY: info installcheck dvi pdf html
|
||||
.PHONY: install-info install-pdf install-html
|
||||
.PHONY: clean distclean mostlyclean maintainer-clean realclean
|
||||
.PHONY: local-clean local-distclean local-maintainer-clean
|
||||
info: do-info
|
||||
|
|
@ -589,6 +591,8 @@ install-info: do-install-info dir.info
|
|||
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
|
||||
else true ; fi
|
||||
|
||||
install-pdf: do-install-pdf
|
||||
|
||||
install-html: do-install-html
|
||||
|
||||
local-clean:
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ PACKAGE_STRING=
|
|||
PACKAGE_BUGREPORT=
|
||||
|
||||
ac_unique_file="move-if-change"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs CC_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES OBJCOPY OBJDUMP CFLAGS_FOR_BUILD CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs CC_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES OBJCOPY OBJDUMP CFLAGS_FOR_BUILD CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -961,6 +961,7 @@ Optional Packages:
|
|||
use given path to find target tools during the build
|
||||
--with-datarootdir Use datarootdir as the data root directory.
|
||||
--with-docdir Install documentation in this directory.
|
||||
--with-pdfdir Install pdf in this directory.
|
||||
--with-htmldir Install html in this directory.
|
||||
|
||||
Some influential environment variables:
|
||||
|
|
@ -4476,9 +4477,11 @@ main ()
|
|||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
mpfr_t x; mpfr_init(x);
|
||||
mpfr_t n;
|
||||
mpfr_t x;
|
||||
int t;
|
||||
mpfr_init (n);
|
||||
mpfr_init (x);
|
||||
mpfr_atan2 (n, n, x, GMP_RNDN);
|
||||
mpfr_erfc (n, x, GMP_RNDN);
|
||||
mpfr_subnormalize (x, t, GMP_RNDN);
|
||||
|
|
@ -11527,6 +11530,15 @@ else
|
|||
fi;
|
||||
|
||||
|
||||
# Check whether --with-pdfdir or --without-pdfdir was given.
|
||||
if test "${with_pdfdir+set}" = set; then
|
||||
withval="$with_pdfdir"
|
||||
pdfdir="\${prefix}/${withval}"
|
||||
else
|
||||
pdfdir="\${docdir}"
|
||||
fi;
|
||||
|
||||
|
||||
# Check whether --with-htmldir or --without-htmldir was given.
|
||||
if test "${with_htmldir+set}" = set; then
|
||||
withval="$with_htmldir"
|
||||
|
|
@ -12280,6 +12292,7 @@ s,@stage1_checking@,$stage1_checking,;t t
|
|||
s,@stage2_werror_flag@,$stage2_werror_flag,;t t
|
||||
s,@datarootdir@,$datarootdir,;t t
|
||||
s,@docdir@,$docdir,;t t
|
||||
s,@pdfdir@,$pdfdir,;t t
|
||||
s,@htmldir@,$htmldir,;t t
|
||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||
|
|
|
|||
12
configure.ac
12
configure.ac
|
|
@ -1163,9 +1163,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
|
|||
#if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
|
||||
choke me
|
||||
#endif
|
||||
mpfr_t n; mpfr_init(n);
|
||||
mpfr_t x; mpfr_init(x);
|
||||
mpfr_t n;
|
||||
mpfr_t x;
|
||||
int t;
|
||||
mpfr_init (n);
|
||||
mpfr_init (x);
|
||||
mpfr_atan2 (n, n, x, GMP_RNDN);
|
||||
mpfr_erfc (n, x, GMP_RNDN);
|
||||
mpfr_subnormalize (x, t, GMP_RNDN);
|
||||
|
|
@ -2610,6 +2612,11 @@ AC_ARG_WITH(docdir,
|
|||
[docdir="\${prefix}/${withval}"],
|
||||
[docdir="\${datarootdir}/doc"])
|
||||
|
||||
AC_ARG_WITH(pdfdir,
|
||||
[ --with-pdfdir Install pdf in this directory.],
|
||||
[pdfdir="\${prefix}/${withval}"],
|
||||
[pdfdir="\${docdir}"])
|
||||
|
||||
AC_ARG_WITH(htmldir,
|
||||
[ --with-htmldir Install html in this directory.],
|
||||
[htmldir="\${prefix}/${withval}"],
|
||||
|
|
@ -2617,6 +2624,7 @@ AC_ARG_WITH(htmldir,
|
|||
|
||||
AC_SUBST(datarootdir)
|
||||
AC_SUBST(docdir)
|
||||
AC_SUBST(pdfdir)
|
||||
AC_SUBST(htmldir)
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
|
|
|
|||
Loading…
Reference in New Issue