[git commit master 1/1] try to fix duplicated slashes in the generated lib*.so files (round 2)

Peter S. Mazinger ps.m at gmx.net
Tue Mar 8 11:56:13 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=2ea26d2c32507f11733a0d62e5723de26ea464ba
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

sed s://:/:g on libc.so/libpthread.so if HARDWIRED_ABSPATH is defined

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 Makefile.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 995347b..8c5689b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -327,6 +327,7 @@ ifeq ($(HARDWIRED_ABSPATH),y)
 		    -e 's:$(SHARED_LIBNAME):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_LIBNAME):' \
 		    -e 's:$(UCLIBC_LDSO):$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UCLIBC_LDSO):' \
 		    $(top_builddir)lib/libc.so > $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \
+		$(SED) -i -e 's://:/:g' $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \
 	fi
 else
 	-$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/
@@ -345,6 +346,7 @@ ifeq ($(HARDWIRED_ABSPATH),y)
 		cp $(top_srcdir)extra/scripts/format.lds $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \
 		echo "GROUP ( $(RUNTIME_PREFIX)$(MULTILIB_DIR)/libpthread.so.$(ABI_VERSION) $(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread_nonshared.a )" \
 			>> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \
+		$(SED) -i -e 's://:/:g' $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libpthread.so; \
 	fi
 else
 	-$(INSTALL) -m 755 $(top_builddir)lib/libpthread.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/
-- 
1.7.3.4



More information about the uClibc-cvs mailing list