rename V variable to lib-version

Due to the rise of kbuild type build systems (as the Linux kernel is a
popularly emulated environment), the V variable has become common as a
knob for controlling verbosity.  Unfortunately, if you run `make V=1`
with glibc during install, it fails with weird errors due to the glibc
build already using this variable for versioning information.

Granted, overriding this variable in the glibc context makes no sense
so people shouldn't be doing it, but when paired with build frameworks
that like to use one set of options for all packages, glibc starts to
stick out as an oddball (in that it fails).  Considering it's easy
enough to rename (it's used in just one place), let's do so.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index d702a0a3b8233dbfa066f05ff54c2d52ed06ace4..656b16893f8d686aef8df884bedfeb1c50251008 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-22  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makerules (lib-version): Rename from V.
+       (install-lib-nosubdir): Change V to lib-version.
+
 2012-08-22  Will Schmidt  <will_schmidt@vnet.ibm.com>
 
        [BZ #14252]

diff --git a/Makerules b/Makerules
index 685b1b86c6eea145c9120ccc36765e0324c73dba..1281b9446a061ab7fa22b5065ed54ebaa1243968 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -841,11 +841,11 @@ install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so))
 #      $(inst_libdir)/libfoo.so        -- for linking, symlink or ld script
 #      $(inst_slibdir)/libfoo.so.NN    -- for loading by SONAME, symlink
 #      $(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file
-V := $(firstword $($(subdir)-version) $(version))
+lib-version := $(firstword $($(subdir)-version) $(version))
 install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \
                      $(foreach L,$(install-lib.so-versioned),\
                                $(inst_libdir)/$L \
-                               $(inst_slibdir)/$(L:.so=)-$V.so \
+                               $(inst_slibdir)/$(L:.so=)-$(lib-version).so \
                                $(inst_slibdir)/$L$($L-version))
 
 # Install all the unversioned shared libraries.