From 48da0b21630bb237b40086726f6ecd5bb2e2d988 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 22 Aug 2012 00:21:31 -0400 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ Makerules | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d702a0a3b8..656b16893f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-08-22 Mike Frysinger + + * Makerules (lib-version): Rename from V. + (install-lib-nosubdir): Change V to lib-version. + 2012-08-22 Will Schmidt [BZ #14252] diff --git a/Makerules b/Makerules index 685b1b86c6..1281b9446a 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. -- 2.11.4.GIT