From 1ddca1872f64c566fd812a6ec44f2d4e4d84f58f Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 28 Jul 2018 13:39:22 -0700 Subject: openssl_1.0: add PACKAGECONFIG option to control manpages Creating the openssl manpages, which happens as part of do_install(), can take a significant amount of time (e.g. ~50 seconds on a quad core laptop). Provide a PACKAGECONFIG option to allow creation of the manpages to be skipped completely if not required and inherit the manpages class to automatically control the PACKAGECONFIG option (based on the "api-documentation" distro feature). Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- .../0001-allow-manpages-to-be-disabled.patch | 31 ++++++++++++++++++++++ .../recipes-connectivity/openssl/openssl_1.0.2o.bb | 8 ++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch new file mode 100644 index 0000000000..3f7d649955 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch @@ -0,0 +1,31 @@ +From e1c39b80b01d4d18feeadfdc6e45a3e1dd110634 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Fri, 27 Jul 2018 21:41:06 +0000 +Subject: [PATCH] allow manpages to be disabled + +Define OE_DISABLE_MANPAGES (via environment or the make command line) +to skip creation and installation of manpages. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andre McCurdy +--- + Makefile.org | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.org b/Makefile.org +index ed98d2a..747d8cb 100644 +--- a/Makefile.org ++++ b/Makefile.org +@@ -549,7 +549,7 @@ dist: + @$(MAKE) SDIRS='$(SDIRS)' clean + @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar + +-install: all install_docs install_sw ++install: all $(if $(OE_DISABLE_MANPAGES),,install_docs) install_sw + + install_sw: + @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ +-- +1.9.1 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb index 2804203e38..bbce14fe6b 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb @@ -43,6 +43,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://Use-SHA256-not-MD5-as-default-digest.patch \ file://0001-Fix-build-with-clang-using-external-assembler.patch \ file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ + file://0001-allow-manpages-to-be-disabled.patch \ " SRC_URI_append_class-target = " \ @@ -59,19 +60,22 @@ SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8 UPSTREAM_CHECK_REGEX = "openssl-(?P1\.0.+)\.tar" -inherit pkgconfig siteinfo multilib_header ptest relative_symlinks +inherit pkgconfig siteinfo multilib_header ptest relative_symlinks manpages PACKAGECONFIG ?= "cryptodev-linux" PACKAGECONFIG_class-native = "" PACKAGECONFIG_class-nativesdk = "" -PACKAGECONFIG[perl] = ",,," PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux" +PACKAGECONFIG[manpages] = ",,," +PACKAGECONFIG[perl] = ",,," # Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE # vulnerability EXTRA_OECONF = "no-ssl3" +EXTRA_OEMAKE = "${@bb.utils.contains('PACKAGECONFIG', 'manpages', '', 'OE_DISABLE_MANPAGES=1', d)}" + export OE_LDFLAGS = "${LDFLAGS}" # openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810 -- cgit 1.2.3-korg