Sorry for the delay.
* Peter O'Gorman wrote on Fri, Dec 09, 2005 at 01:41:55PM CET:
> Ralf Wildenhues wrote:
> | [ 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.
>
> Looks fine.
Well, I just applied this to branch-1-5 for now. CVS HEAD works
differently here: build_old_libs and build_libtool_libs are not output
for each tag (CXX, F77, ...), only for the default (CC) tag, so the
other ones can't overwrite the setting done by --tag=disable-shared.
Cheers,
Ralf
2005-12-18 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.110
diff -u -r1.334.2.110 ltmain.in
--- ltmain.in 13 Dec 2005 14:39:22 -0000 1.334.2.110
+++ ltmain.in 18 Dec 2005 12:24:59 -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
@@ -503,6 +505,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.
@@ -6748,12 +6762,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:
