[Pkg-openssl-changes] r892 - openssl/branches/1.1.0/debian

[Sebastian Andrzej Siewior]

Author: bigeasy
Date: 2017-01-29 19:47:00 +0000 (Sun, 29 Jan 2017)
New Revision: 892

Modified:
   openssl/branches/1.1.0/debian/changelog
   openssl/branches/1.1.0/debian/rules
Log:
fixup arch-any + arch-all build in minimal environment



Modified: openssl/branches/1.1.0/debian/changelog
===================================================================
--- openssl/branches/1.1.0/debian/changelog	2017-01-27 21:23:03 UTC (rev 891)
+++ openssl/branches/1.1.0/debian/changelog	2017-01-29 19:47:00 UTC (rev 892)
@@ -1,3 +1,10 @@
+openssl (1.1.0d-2) UNRELEASED; urgency=medium
+
+  * Fix building of arch and all packages in a minimal environment
+    (Closes: #852900)
+
+ -- Sebastian Andrzej Siewior <sebastian at breakpoint.cc>  Sun, 29 Jan 2017 20:32:07 +0100
+
 openssl (1.1.0d-1) unstable; urgency=medium
 
   * New Upstream release

Modified: openssl/branches/1.1.0/debian/rules
===================================================================
--- openssl/branches/1.1.0/debian/rules	2017-01-27 21:23:03 UTC (rev 891)
+++ openssl/branches/1.1.0/debian/rules	2017-01-29 19:47:00 UTC (rev 892)
@@ -96,11 +96,14 @@
 	dh_auto_clean
 
 override_dh_auto_install-indep:
-	$(MAKE) -C build_shared install DESTDIR=`pwd`/debian/tmp
-	# Those two ensure that it is not installed in case we build both
-	# (ARCH and INDEP) in one go
-	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl
-	mv debian/tmp/usr/include/openssl/opensslconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl/
+	# Install is only required for the -indep only build, that is if
+	# -arch isn't run as well. Otherwise install will fail because
+	# usr/lib/ssl/cert is a symlink to a non existing target.
+	if [ ! -L debian/tmp/usr/lib/ssl/certs ]; then \
+		$(MAKE) -C build_shared install DESTDIR=`pwd`/debian/tmp ;\
+		mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl ;\
+		mv debian/tmp/usr/include/openssl/opensslconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl/ ;\
+	fi
 
 override_dh_auto_install-arch:
 	$(MAKE) -C build_shared install DESTDIR=`pwd`/debian/tmp