]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
Merge branch 'sysroot'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 28 Aug 2010 08:39:40 +0000 (10:39 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sat, 28 Aug 2010 08:39:40 +0000 (10:39 +0200)
* sysroot:
  Add ChangeLog entries for the sysroot branch.
  fix AIX testsuite regression
  fix --mode=finish
  improve code for sysroot --mode=finish
  add libtool --mode=finish mode for sysroot
  reorganize parsing of --mode=finish arguments
  fix sysroot handling for deplibs of preopened libtool libs
  fix sysroot tests to pass on Fedora 13
  initial version of the NEWS entry
  add sysroot test
  emit sysrooted paths when installing .la files
  process postdeps to include sysrooted paths
  handle sysrooted paths when reading dependencies to la files
  teach libtool -L= and -R=
  add --with-sysroot
  handle sysroot flags

1  2 
ChangeLog
Makefile.am
NEWS
doc/libtool.texi

diff --cc ChangeLog
index 77a0b2a02f2fbb7cef6e7d47e5638e6eaa273a69,9ba13433ba1a342209813a7f8209a83cdd7595d6..036eb2d383a7eccf12a04a052564dae46d1cbe8a
+++ b/ChangeLog
+ 2010-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       fix AIX testsuite regression
+       * libltdl/config/ltmain.m4sh (func_resolve_sysroot): Partly
+       revert v2.2.10-83-gc45a288: Do not absolutize path here, only do
+       sysroot replacement.
+       (func_mode_link): Adjust.
+ 2010-08-22  Charles Wilson  <libtool@cwilson.fastmail.fm>
+       fix --mode=finish
+       * libltdl/config/ltmain.m4sh (func_mode_finish): Invert then/else
+       blocks of the "if $opt_dry_run" conditional.
+ 2010-08-15  Paolo Bonzini  <bonzini@gnu.org>
+       improve code for sysroot --mode=finish
+       * libltdl/config/ltmain.m4sh (func_mode_finish): Change sysroot_regex
+       and sysroot_cmd delimiter from pipe to slash.  Wrap the entire for
+       loop with "if $opt_dry_run...fi" and print an explanatory message
+       for the --dry-run case.
+ 2010-08-12  Paolo Bonzini  <bonzini@gnu.org>
+       add libtool --mode=finish mode for sysroot
+       * doc/libtool.texi (Finish mode): Document behavior when *.la files
+       are passed.
+       * libltdl/config/ltmain.m4sh (func_mode_finish): Eliminate sysroot
+       or `=' signs representing it from files in $libs.
+       * tests/sysroot.at (SYSROOT_TESTS): Test for presence of sysroot
+       references before running libtool --mode=finish, and for absence
+       afterwards.
+       reorganize parsing of --mode=finish arguments
+       * libltdl/config/ltmain.m4sh (func_mode_finish): Split arguments for
+       directories and *.la files.
+       fix sysroot handling for deplibs of preopened libtool libs
+       * libltdl/config/ltmain.m4sh: Pass $dependency_libs of preopened libtool
+       through func_resolve_sysroot.
+       fix sysroot tests to pass on Fedora 13
+       * tests/sysroot.at: Link $prefix/include into the sysroot as well, as
+       required by newer GCC.
+ 2010-07-29  Paolo Bonzini  <bonzini@gnu.org>
+       initial version of the NEWS entry
+       * NEWS: Document sysroot support.
+       add sysroot test
+       * Makefile.am (TESTSUITE_AT): Add tests/sysroot.at.
+       * tests/sysroot.at: New.
+       emit sysrooted paths when installing .la files
+       * libltdl/config/ltmain.m4sh (func_replace_sysroot): New.
+       (func_mode_link): Prepend paths in $libdir with the sysroot.  Further,
+       replace the sysroot with = (using func_replace_sysroot) whenever
+       such a path is written in a .la file.
+       process postdeps to include sysrooted paths
+       * libltdl/m4/libtool.m4 (_LT_FUNC_STRIPNAME_CNF): New (from Charles Wilson).
+       (_LT_SYS_HIDDEN_LIBDEPS): Require it.  Use func_stripname_cnf to convert
+       sysroot (-L= and -R=) usage in postdeps.  Adjust the code because -L, -R
+       and -l flags will now always be separated from the rest of the argument.
+       handle sysrooted paths when reading dependencies to la files
+       * libltdl/config/ltmain.m4sh (func_mode_execute, func_mode_install,
+       func_mode_link): Whenever a .la file occurs in another .la file,
+       expand the sysroot path in it.
+ 2010-07-28  Paolo Bonzini  <bonzini@gnu.org>
+       teach libtool -L= and -R=
+       * libltdl/config/ltmain.m4sh (func_resolve_sysroot): New.
+       (func_mode_link): Always pass result of stripping -L and -R to
+       func_resolve_sysroot before using it.  Remove absolute path expansion
+       when func_resolve_sysroot subsumes it.  Expand sysroot in -rpath.
+       When processing dependent libraries also resolve sysroot paths there.
+       add --with-sysroot
+       * libltdl/m4/libtool.m4 (_LT_HOST_NONCANONICAL, _LT_WITH_SYSROOT): New.
+       (LT_SETUP): Require _LT_WITH_SYSROOT.
+       handle sysroot flags
+       * libltdl/config/ltmain.m4sh (func_mode_link): Recognize --sysroot
+       option.
 +2010-08-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      * NEWS: Only bootstrapping needs new Automake and Autoconf.
 +
 +      check-interactive and check-noninteractive for both testsuites.
 +      * Makefile.am (COMMON_TESTS, TESTS): Split into ...
 +      (NONINTERACTIVE_TESTS, INTERACTIVE_TESTS): ... these new
 +      variables.
 +      (check-interactive-new): Rename from check-interactive.
 +      (check-noninteractive-new): Rename from check-noninteractive.
 +      (check-interactive-old, check-noninteractive-old): New targets.
 +      (check-interactive, check-noninteractive): Depend on the
 +      respective targets for the old and the new test suites.
 +      * doc/libtool.texi (Test descriptions): Simplify description
 +      about check-interactive and check-noninteractive.  Add index
 +      entries.
 +
 +      Adjust docs for renaming and for parallel-tests.
 +      * README: Update example TESTS setting.
 +      * README.alpha: Likewise.
 +      * doc/libtool.texi (Test descriptions): Update for test renaming,
 +      adjust descriptions accordingly.
 +
 +      Update VERBOSE handling for parallel-tests driver.
 +      * tests/defs.m4sh: Default to verbose output, drop now-unneeded
 +      handling of 'VERBOSE=no'.
 +      * README: Update example usage.
 +      * README.alpha: Likewise.
 +      * doc/libtool.texi (Test descriptions, When tests fail): Remove
 +      unneeded VERBOSE recommendations.  Point to per-test log files
 +      and test-suite.log summary file.
 +
 +      Enable parallel-tests test driver for the old testsuite.
 +      * configure.ac: New configure test to find out whether `make'
 +      supports order-only prerequisites; set @ORDER@ accordingly.
 +      (AM_INIT_AUTOMAKE): Enable parallel-tests option.
 +      * tests/defs.m4sh (prefix): Derive install prefix for tests
 +      from the test name, to avoid clashes.
 +      * Makefile.am (CXX_TESTS, F77_TESTS, FC_TESTS, COMMON_TESTS):
 +      Reformat.  Adjust for renamed tests.  Add dependencies between
 +      the respective log files of the tests, to ensure proper ordering.
 +      Use order-only dependencies if possible, between test groups that
 +      use the same directory.
 +      (clean-local-legacy): Remove `_inst-*' directories as well.
 +      Prompted by suggestion from Bob Friesenhahn.
 +
 +      New alias scripts for old tests run more than once.
 +      * tests/cdemo-shared-exec.test, tests/cdemo-shared-make.test,
 +      tests/cdemo-static-exec.test, tests/cdemo-static-make.test,
 +      tests/cdemo-undef-exec.test, tests/cdemo-undef-make.test,
 +      tests/demo-nofast-exec.test, tests/demo-nofast-inst.test,
 +      tests/demo-nofast-make.test, tests/demo-nofast-unst.test,
 +      tests/demo-nopic-exec.test, tests/demo-nopic-make.test,
 +      tests/demo-pic-exec.test, tests/demo-pic-make.test,
 +      tests/demo-shared-exec.test, tests/demo-shared-inst.test,
 +      tests/demo-shared-make.test, tests/demo-shared-unst.test,
 +      tests/demo-static-exec.test, tests/demo-static-inst.test,
 +      tests/demo-static-make.test, tests/demo-static-unst.test,
 +      tests/depdemo-nofast-exec.test, tests/depdemo-nofast-inst.test,
 +      tests/depdemo-nofast-make.test, tests/depdemo-nofast-unst.test,
 +      tests/depdemo-shared-exec.test, tests/depdemo-shared-inst.test,
 +      tests/depdemo-shared-make.test, tests/depdemo-shared-unst.test,
 +      tests/depdemo-static-exec.test, tests/depdemo-static-inst.test,
 +      tests/depdemo-static-make.test, tests/depdemo-static-unst.test,
 +      tests/f77demo-shared-exec.test, tests/f77demo-shared-make.test,
 +      tests/f77demo-static-exec.test, tests/f77demo-static-make.test,
 +      tests/fcdemo-shared-exec.test, tests/fcdemo-shared-make.test,
 +      tests/fcdemo-static-exec.test, tests/fcdemo-static-make.test,
 +      tests/mdemo-shared-exec.test, tests/mdemo-shared-inst.test,
 +      tests/mdemo-shared-make.test, tests/mdemo-shared-unst.test,
 +      tests/mdemo-static-exec.test, tests/mdemo-static-inst.test,
 +      tests/mdemo-static-make.test, tests/mdemo-static-unst.test,
 +      tests/tagdemo-shared-exec.test, tests/tagdemo-shared-make.test,
 +      tests/tagdemo-static-exec.test, tests/tagdemo-static-make.test,
 +      tests/tagdemo-undef-exec.test, tests/tagdemo-undef-make.test:
 +      New files.
 +
 +      Require Automake 1.11.1 for Libtool, enable color-tests.
 +      * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.1.  Enable
 +      color-tests.
 +      (LTDL_SUBDIR_LIBOBJS): Remove now-obsolete conditional and
 +      feature test for Autoconf 2.59 and Automake 1.9.x workaround.
 +      * Makefile.am: Simplify accordingly.
 +      * bootstrap: Remove obsolete WORKING_LIBOBJ_SUPPORT workarounds
 +      for Autoconf 2.59 and Automake 1.9.6.
 +
 +2010-08-23  Charles Wilson  <libtool@cwilson.fastmail.fm>
 +
 +      Fix syntax for cygwin-cross
 +      libltdl/m4/argz.m4: Add quotes around variable, which
 +      may contain the multiword value 'guessing no'.
 +
 +2010-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      configure: use Autobuild AB_INIT if available.
 +      * configure.ac: Call AB_INIT if it is defined, with
 +      $autobuild_mode as argument, to be set at configure time.
 +      Set AB_VERSION to the Libtool version string.
 +      * HACKING: Update.
 +
 +      Fix getopt tests to skip with Autoconf < 2.61.
 +      * tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Skip the test
 +      if 'autom4te --language=m4sh' exits 63 because version 2.61 is
 +      required.  Allows the testsuite to complete successfully with
 +      Autoconf 2.59 and Automake 1.9.6.
 +
 +      Tidy and fix clean and distclean rules for old testsuite.
 +      * Makefile.am (clean-local-legacy): Use $(CONF_SUBDIRS) instead
 +      of hard-coding the list of test directories.  Use
 +      $(AM_MAKEFLAGS).
 +      (fake-distclean-legacy): New phony rule, to create fake Makefile
 +      files if needed so that the automake-generated
 +      distclean-recursive rule can work properly.
 +      (distclean_recursive): New helper variable.
 +      (distclean-recursive): Depend on fake-distclean-legacy.
 +
  2010-08-22  Paolo Bonzini  <bonzini@gnu.org>
  
        Fix sed_make_literal_regex.
diff --cc Makefile.am
Simple merge
diff --cc NEWS
index 11ae6ca6726ea4f9c607fdb556839325a2d6c469,68ebcee4fa14033399358a4305a7d3b5dc0ba232..a6e73c2df9e1b553bb63c74ead9618edf2bc03a5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,20 -4,20 +4,30 @@@ New in 2.2.12 2010-08-??: git version 2
  
  * New features:
  
+   - Sysroot support.  This allows you to build cross-compiled packages
+     with the same prefix that will be used on the destination machine,
+     and still find dependent libraries under the compiler's "sysroot".
+     Without sysroot support, paths internal to the build system may leak
+     into the product of the build.
+     Sysroot support is disabled unless the --with-sysroot configure
+     option is passed to configure, because .la files generated with
+     sysroot support will _not_ be usable in general with older Libtools.
    - On non-cygwin Windows systems, we now lookup potential library
      file names without regard to file name case.
 +  - The old testsuite now uses the `parallel-tests' Automake test driver
 +    now for more concurrency and better test logging.  For this, tests are
 +    run in verbose mode by default now.
 +
 +* Important incompatible changes:
 +
 +  - Autoconf 2.62 and Automake 1.11.1 or newer are now required for
 +    bootstrapping Libtool.  For using Libtool in your own projects,
 +    Autoconf 2.59 and Automake 1.9.6 should still work.
  
  * Changes in supported systems or compilers:
 +
    - Initial support for the Microsoft C/C++ Compiler, with help from
      the compile script in unreleased Automake 1.12. Override the manifest
      tool used to embed the manifest resource through the environment
Simple merge