diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-07-28 13:39:22 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:35 +0100 |
commit | e0058efd4b85f5481989bfdf0ca7d36d0809c10f (patch) | |
tree | aa3b6bddcfd54a6211b3095bbdb794f06059c916 | |
parent | 9abe887150b0da96498a70fe2d98d96eb610dec2 (diff) | |
download | poky-e0058efd4b85f5481989bfdf0ca7d36d0809c10f.tar.gz |
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).
(From OE-Core rev: 1ddca1872f64c566fd812a6ec44f2d4e4d84f58f)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2o/0001-allow-manpages-to-be-disabled.patch | 31 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2o.bb | 8 |
2 files changed, 37 insertions, 2 deletions
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 @@ | |||
1 | From e1c39b80b01d4d18feeadfdc6e45a3e1dd110634 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Fri, 27 Jul 2018 21:41:06 +0000 | ||
4 | Subject: [PATCH] allow manpages to be disabled | ||
5 | |||
6 | Define OE_DISABLE_MANPAGES (via environment or the make command line) | ||
7 | to skip creation and installation of manpages. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
12 | --- | ||
13 | Makefile.org | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/Makefile.org b/Makefile.org | ||
17 | index ed98d2a..747d8cb 100644 | ||
18 | --- a/Makefile.org | ||
19 | +++ b/Makefile.org | ||
20 | @@ -549,7 +549,7 @@ dist: | ||
21 | @$(MAKE) SDIRS='$(SDIRS)' clean | ||
22 | @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar | ||
23 | |||
24 | -install: all install_docs install_sw | ||
25 | +install: all $(if $(OE_DISABLE_MANPAGES),,install_docs) install_sw | ||
26 | |||
27 | install_sw: | ||
28 | @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ | ||
29 | -- | ||
30 | 1.9.1 | ||
31 | |||
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 \ | |||
43 | file://Use-SHA256-not-MD5-as-default-digest.patch \ | 43 | file://Use-SHA256-not-MD5-as-default-digest.patch \ |
44 | file://0001-Fix-build-with-clang-using-external-assembler.patch \ | 44 | file://0001-Fix-build-with-clang-using-external-assembler.patch \ |
45 | file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ | 45 | file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ |
46 | file://0001-allow-manpages-to-be-disabled.patch \ | ||
46 | " | 47 | " |
47 | 48 | ||
48 | SRC_URI_append_class-target = " \ | 49 | SRC_URI_append_class-target = " \ |
@@ -59,19 +60,22 @@ SRC_URI[sha256sum] = "ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8 | |||
59 | 60 | ||
60 | UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar" | 61 | UPSTREAM_CHECK_REGEX = "openssl-(?P<pver>1\.0.+)\.tar" |
61 | 62 | ||
62 | inherit pkgconfig siteinfo multilib_header ptest relative_symlinks | 63 | inherit pkgconfig siteinfo multilib_header ptest relative_symlinks manpages |
63 | 64 | ||
64 | PACKAGECONFIG ?= "cryptodev-linux" | 65 | PACKAGECONFIG ?= "cryptodev-linux" |
65 | PACKAGECONFIG_class-native = "" | 66 | PACKAGECONFIG_class-native = "" |
66 | PACKAGECONFIG_class-nativesdk = "" | 67 | PACKAGECONFIG_class-nativesdk = "" |
67 | 68 | ||
68 | PACKAGECONFIG[perl] = ",,," | ||
69 | PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux" | 69 | PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux" |
70 | PACKAGECONFIG[manpages] = ",,," | ||
71 | PACKAGECONFIG[perl] = ",,," | ||
70 | 72 | ||
71 | # Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE | 73 | # Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE |
72 | # vulnerability | 74 | # vulnerability |
73 | EXTRA_OECONF = "no-ssl3" | 75 | EXTRA_OECONF = "no-ssl3" |
74 | 76 | ||
77 | EXTRA_OEMAKE = "${@bb.utils.contains('PACKAGECONFIG', 'manpages', '', 'OE_DISABLE_MANPAGES=1', d)}" | ||
78 | |||
75 | export OE_LDFLAGS = "${LDFLAGS}" | 79 | export OE_LDFLAGS = "${LDFLAGS}" |
76 | 80 | ||
77 | # openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810 | 81 | # openssl fails with ccache: https://bugzilla.yoctoproject.org/show_bug.cgi?id=12810 |