diff options
| author | Daniel Jacobowitz <drow@false.org> | 2006-10-02 18:39:33 +0400 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2006-10-02 18:39:33 +0400 |
| commit | a86b4ec7670976eea45b2b50a18e961482f84f66 (patch) | |
| tree | 716598eb1976d559f85a3c9acb2d68f93ea7c8bb | |
| parent | 74e7a0bb4192a6ebba020442b7afaef8ab135dfe (diff) | |
2006-06-15 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.def (fixincludes): Correct extra_configure_flags
typo.
(expat): Don't install. Don't build shared libraries.
* Makefile.in: Regenerated.
| -rw-r--r-- | ChangeLog.csl | 9 | ||||
| -rw-r--r-- | Makefile.def | 3 | ||||
| -rw-r--r-- | Makefile.in | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 63086bc43..0e5d38a22 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,12 @@ +2006-10-02 Daniel Jacobowitz <dan@codesourcery.com> + + Backport: + 2006-06-15 Daniel Jacobowitz <dan@codesourcery.com> + * Makefile.def (fixincludes): Correct extra_configure_flags + typo. + (expat): Don't install. Don't build shared libraries. + * Makefile.in: Regenerated. + 2006-09-28 Daniel Jacobowitz <dan@codesourcery.com> gdb/ diff --git a/Makefile.def b/Makefile.def index 3c87dce68..d25df408e 100644 --- a/Makefile.def +++ b/Makefile.def @@ -47,7 +47,8 @@ host_modules= { module= dejagnu; }; host_modules= { module= diff; }; host_modules= { module= dosutils; no_check= true; }; host_modules= { module= etc; }; -host_modules= { module= expat; }; +host_modules= { module= expat; no_install= true; + extra_configure_flags='--disable-shared'; }; host_modules= { module= fastjar; no_check_cross= true; }; host_modules= { module= fileutils; }; host_modules= { module= findutils; }; diff --git a/Makefile.in b/Makefile.in index 15a98abc0..59f561a30 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8392,7 +8392,7 @@ configure-expat: srcdiroption="--srcdir=$${topdir}/expat"; \ libsrcdir="$$s/expat"; \ $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ + $(HOST_CONFIGARGS) $${srcdiroption} --disable-shared \ || exit 1 @endif expat @@ -8437,13 +8437,7 @@ maybe-install-expat: @if expat maybe-install-expat: install-expat -install-expat: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/expat && \ - $(MAKE) $(FLAGS_TO_PASS) install) +install-expat: @endif expat |