diff --git a/Makefile b/Makefile index 4ddef7d..893c6a7 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ REPO = core BRIEF = The GNU C Library DESC = The GNU C Library is used as the C library in the GNU system and in \ GNU/Linux systems, as well as many other systems that use Linux as the kernel. -SNAPVER = 8 +SNAPVER = 9 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -82,7 +82,7 @@ $(ROOT): $(BUILDDIR)/elf/ldd install -m 644 $(PWD)/SNAP/nsswitch.conf \ $(ROOT)/usr/share/glibc/nsswitch.conf && \ rm -v $(ROOT)/usr/share/info/dir && \ - rm -v $(ROOT)/etc/ld.so.cache + mv -v $(ROOT)/etc/ld.so.cache $(ROOT)/usr/share/glibc @install -d -v $(DEV)/SNAP && \ for file in `find $(ROOT)|egrep 'man3\/|\.a$$|\.c$$|\.h$$'`; do \ diff --git a/SNAP/usher b/SNAP/usher index 803055e..4510683 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -7,6 +7,10 @@ case $1 in exit 0 ;; postinst) + if [ ! -f /etc/ld.so.cache ]; then + cp /usr/share/glibc/ld.so.cache /etc/ld.so.cache + fi + if [ ! -f /etc/ld.so.conf ]; then cp /usr/share/glibc/ld.so.conf /etc/ld.so.conf fi @@ -14,8 +18,6 @@ case $1 in if [ ! -f /etc/nsswitch.conf ]; then cp /usr/share/glibc/nsswitch.conf /etc/nsswitch.conf fi - - ldconfig ;; prerm) exit 0