aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-08-22 00:21:31 -0400
committerMike Frysinger <vapier@gentoo.org>2012-08-22 12:33:52 -0400
commit48da0b21630bb237b40086726f6ecd5bb2e2d988 (patch)
treeb9002b0515d8d0281b19be1c7338d384815b8182
parent8c4ae0d4e5fbb98cc42e6207ff94f442df385bd2 (diff)
downloadglibc-48da0b21630bb237b40086726f6ecd5bb2e2d988.zip
glibc-48da0b21630bb237b40086726f6ecd5bb2e2d988.tar.gz
glibc-48da0b21630bb237b40086726f6ecd5bb2e2d988.tar.bz2
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>
-rw-r--r--ChangeLog5
-rw-r--r--Makerules4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d702a0a..656b168 100644
--- 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 685b1b8..1281b94 100644
--- 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.