From: Jan Luebbe <[email protected]> ecryptfs-utils links to -lssl3 -lsmime3, without using any functions from it. Install all libraries to the sysroot to make it work. The unused libraries are still not installed on the target.
Signed-off-by: Jan Luebbe <[email protected]> Signed-off-by: Roland Hieber <[email protected]> --- I overlook this patch in v2, but discovered it again during build-testing... v2 -> v3: new patch rules/nss.make | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rules/nss.make b/rules/nss.make index 6a003dd1743f..c8537ceb521b 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -74,24 +74,13 @@ NSS_INSTALL_OPT := \ $(NSS_MAKE_OPT) \ install -NSS_LIBS := \ - libnss3 \ - libnssutil3 \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSMIME, libsmime3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSSL, libssl3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBNSSCKBI, libnssckbi,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreebl3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreeblpriv3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libnssdbm3,) \ - $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libsoftokn3,) - $(STATEDIR)/nss.install: @$(call targetinfo) @$(call world/install, NSS) - @$(foreach lib,$(NSS_LIBS), \ - install -v -m644 -D $(NSS_DIR)/dist/Linux$(PTXCONF_KERNEL_VERSION)_$(NSS_ARCH)_*/lib/$(lib).so \ - $(NSS_PKGDIR)/usr/lib/$(lib).so$(ptx/nl)) + install -d -m755 $(NSS_PKGDIR)/usr/lib/ + install -m 644 $(NSS_DIR)/dist/Linux$(PTXCONF_KERNEL_VERSION)_$(NSS_ARCH)_*/lib/*.so \ + $(NSS_PKGDIR)/usr/lib/ install -d $(NSS_PKGDIR)/usr/lib/pkgconfig/ VERSION=$(NSS_VERSION) ptxd_replace_magic \ @@ -106,6 +95,17 @@ $(STATEDIR)/nss.install: # Target-Install # ---------------------------------------------------------------------------- +NSS_LIBS := \ + libnss3 \ + libnssutil3 \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSMIME, libsmime3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSSL, libssl3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBNSSCKBI, libnssckbi,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreebl3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libfreeblpriv3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libnssdbm3,) \ + $(call ptx/ifdef, PTXCONF_NSS_INSTALL_LIBSOFTOKN, libsoftokn3,) + $(STATEDIR)/nss.targetinstall: @$(call targetinfo) -- 2.27.0 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
