[OE-core] [PATCH 4/5] openssl_1.0: add PACKAGECONFIG option to control manpages

[Andre McCurdy]

On Sat, Jul 28, 2018 at 4:57 AM, Burton, Ross <ross.burton at intel.com> wrote:
> You might want to use the manpages class here.

Thanks. I was wondering if I could justify disabling the manpages by
default for the target builds too and the api-documentation distro
feature does exactly that :-)

> On 28 July 2018 at 00:28, Andre McCurdy <armccurdy at gmail.com> wrote:
>> 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. Leave manpages
>> enabled by default for target builds, but disable by default for
>> -native and -nativesdk.
>>
>> Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
>> ---
>>  .../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
>>
>> 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 0000000..3f7d649
>> --- /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 <armccurdy at gmail.com>
>> +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 <armccurdy at gmail.com>
>> +---
>> + 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 2804203..527be72 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 = " \
>> @@ -61,17 +62,20 @@ UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar"
>>
>>  inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
>>
>> -PACKAGECONFIG ?= "cryptodev-linux"
>> +PACKAGECONFIG ?= "cryptodev-linux manpages"
>>  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
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core