[ see http://article.gmane.org/gmane.os.openbsd.ports/15455 ]
* Marc Espie wrote on Fri, Dec 09, 2005 at 12:13:45AM CET: > > This includes the former --tag CXX fix, plus the part that makes > --tag=disable-static > --tag=disable-shared > > independent from other tags by delaying their effect. libtool-patches readers: any reason against putting this in branch-1-5 and forward-porting? I can't see any, but am not totally sure. If not, I'll forward-port and write a test for HEAD. The only bit I changed was to use plain echo instead of $echo, which is safe here. Cheers, and thank you for the patch, Ralf 2005-12-09 Marc Espie <[EMAIL PROTECTED]> * ltmain.in: Change semantics of `--tag=disable-static' and `--tag=disable-shared': The last one given wins now, both override the default setting inherited by other `--tag' arguments, even if passed later on the command line. Still make sure we do not disable both kinds by falling back to static libraries. Index: ltmain.in =================================================================== RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v retrieving revision 1.334.2.108 diff -u -r1.334.2.108 ltmain.in --- ltmain.in 3 Dec 2005 08:34:11 -0000 1.334.2.108 +++ ltmain.in 9 Dec 2005 08:48:27 -0000 @@ -351,6 +351,8 @@ # Darwin sucks eval std_shrext=\"$shrext_cmds\" +disable_libs=no + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -499,6 +501,18 @@ exit $EXIT_FAILURE fi +case $disable_libs in +no) + ;; +shared) + build_libtool_libs=no + build_old_libs=yes + ;; +static) + build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` + ;; +esac + # If this variable is set in any of the actions, the command in it # will be execed at the end. This prevents here-documents from being # left over by shells. @@ -6740,12 +6754,11 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes +disable_libs=shared # ### END LIBTOOL TAG CONFIG: disable-shared # ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` +disable_libs=static # ### END LIBTOOL TAG CONFIG: disable-static # Local Variables: