[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 4/6] Be a bit more resilient to restarting a failed build

It doesn't hurt not to fail if these already exist, even though they normally
shouldn't on the first pass through a clean build tree.  I did have a rebuild
fail due to this though and that shouldn't happen either.
 debian/rules.d/binary-libstdcxx-cross.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/binary-libstdcxx-cross.mk b/debian/rules.d/binary-libstdcxx-cross.mk
index 18ca49a..e5e6c9d 100644
--- a/debian/rules.d/binary-libstdcxx-cross.mk
+++ b/debian/rules.d/binary-libstdcxx-cross.mk
@@ -146,8 +146,8 @@ $(binary_stamp)-libstdcxx: $(install_stamp)
 	dh_makeshlibs -p$(p_lib) -V '$(p_lib) (>= $(DEB_STDCXX_SOVERSION))' -n
 	sed s/$(cross_lib_arch)//g < debian/$(p_lib)/DEBIAN/shlibs > debian/$(p_lib)/DEBIAN/shlibs.fixed
 	mv debian/$(p_lib)/DEBIAN/shlibs.fixed debian/$(p_lib)/DEBIAN/shlibs
-	mkdir debian/$(p_lib)-deps
-	ln -s "`readlink -e /usr/$(DEB_TARGET_GNU_TYPE)/lib`" debian/$(p_lib)-deps/lib
+	mkdir -p debian/$(p_lib)-deps
+	ln -nfs "`readlink -e /usr/$(DEB_TARGET_GNU_TYPE)/lib`" debian/$(p_lib)-deps/lib
 	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lib) -L$(p_lib)-deps
 	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_lib).substvars > debian/$(p_lib).substvars.new
 	mv debian/$(p_lib).substvars.new debian/$(p_lib).substvars

Reply to: