OmegaPhil:
> Sorry, I've put this email through patch, and then manually copied out
> the text and tried again, but the patch doesn't apply. Is this supposed
> to go on top of aufs4.1?
Sorry. There is another patch before that.
My current aufs4.1 looks like this.
95f0af1 2016-10-06 make sure all are built before installing
a74dda0 2016-10-06 tiny, silence a garbage
3557ce3 2016-10-06 bugfix, stop evaluating test_glibc when 'make clean'
4647760 2016-10-06 bugfix, simplify LibAuDir variable
1bbc953 2016-10-06 version aufs4.1
92d857b 2016-10-01 aufs-util 20161003
4d295ae 2016-10-01 possible bugfix, auplink_ftw, prohibit 'touch' to create a
new file
:::
The in my previous mail is in above list.
3557ce3 2016-10-06 bugfix, stop evaluating test_glibc when 'make clean'
Just before that, there is
4647760 2016-10-06 bugfix, simplify LibAuDir variable
And without 4647760, 3557ce3 won't be applied, sorry.
Here is 4647760.
J. R. Okajima
commit 4647760ff509de9d85c492f38492e8984770c2f7
Author: J. R. Okajima <[email protected]>
Date: Wed Oct 5 20:58:37 2016 +0900
bugfix, simplify LibAuDir variable
Simply set the default dir.
Reported-by: OmegaPhil <[email protected]>
See-also:
http://www.mail-archive.com/[email protected]/msg05395.html
Signed-off-by: J. R. Okajima <[email protected]>
diff --git a/Makefile b/Makefile
index 72b68ee..fa96b6c 100644
--- a/Makefile
+++ b/Makefile
@@ -65,20 +65,7 @@ endef
$(eval Glibc=$(call test_glibc, ${CC}, ver.c))
#$(warning Glibc=${Glibc})
-ifneq (${CC},${HOSTCC})
- ifeq (${LibAuDir},)
-$(warning Warning: CC is set, but LibAuDir.)
- LibAuDir = $(shell ldconfig -p | \
- fgrep libc. | \
- head -n 1 | \
- cut -f2 -d'>' | \
- xargs -r dirname)
- ifeq (${LibAuDir},)
- LibAuDir = /usr/lib
- endif
- endif
-endif
-
+LibAuDir ?= /usr/lib
ExtlibPath = extlib/glibc
ExtlibObj = au_nftw.o
ifeq (${Glibc},no)
diff --git a/README b/README
index 50b44f8..0f533ae 100644
--- a/README
+++ b/README
@@ -66,10 +66,9 @@ Makefile in this tree has some customizable make-variables.
- LibAuDir
specify the directory path to install the shared object library
- libau.so. The default is taken from the output of ldconfig -p. If it
- fails, then set to /usr/lib.
- This make variable will be useful for the system who have both of
- glibc and musl-libc.
+ libau.so. The default is /usr/lib.
+ This make variable will be useful for the system who has both of
+ glibc and musl-libc, or the system who has x86_64 and i686 libraries.
- MountCmd, UmountCmd
specify mount(8) and umount(8) in full path. By default, they are
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
