Patchwork rpm: Fix automagic dependency on openssl

login
register
mail settings
Submitter Markos Chandras
Date April 3, 2012, 8:35 a.m.
Message ID <1333442128-16629-1-git-send-email-markos.chandras@imgtec.com>
Download mbox | patch
Permalink /patch/150339/
State Changes Requested
Headers show

Comments

Markos Chandras - April 3, 2012, 8:35 a.m.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 package/rpm/rpm.mk |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
Peter Korsgaard - April 3, 2012, 9:29 p.m.
>>>>> "Markos" == Markos Chandras <markos.chandras@imgtec.com> writes:

 Markos> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
 Markos> ---
 Markos>  package/rpm/rpm.mk |    7 +++++++
 Markos>  1 files changed, 7 insertions(+), 0 deletions(-)

 Markos> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
 Markos> index 9f42ee1..47c2ee9 100644
 Markos> --- a/package/rpm/rpm.mk
 Markos> +++ b/package/rpm/rpm.mk
 Markos> @@ -17,6 +17,13 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 Markos>  	--with-libbeecrypt=$(STAGING_DIR) \
 Markos>  	--with-popt=$(STAGING_DIR)
 
 Markos> +ifeq ($(BR2_PACKAGE_OPENSSL),y)
 Markos> +RPM_DEPENDENCIES += openssl
 Markos> +RPM_CONF_OPT += --with-openssl=external
 Markos> +else
 Markos> +RPM_CONF_OPT += --with-openssl=no
 Markos> +endif

Hmm, this makes sense but BR2_PACKAGE_RPM selects
BR2_PACKAGE_OPENSSL. Is openssl optional? If so, please drop the select
line in Config.in.
Markos Chandras - April 4, 2012, 9:15 a.m.
On 04/03/2012 10:29 PM, Peter Korsgaard wrote:

>>>>>> "Markos" == Markos Chandras <markos.chandras@imgtec.com> writes:
> 
>  Markos> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
>  Markos> ---
>  Markos>  package/rpm/rpm.mk |    7 +++++++
>  Markos>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
>  Markos> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
>  Markos> index 9f42ee1..47c2ee9 100644
>  Markos> --- a/package/rpm/rpm.mk
>  Markos> +++ b/package/rpm/rpm.mk
>  Markos> @@ -17,6 +17,13 @@ RPM_CONF_OPT = --disable-build-versionscript
> --disable-rpath \
>  Markos>        --with-libbeecrypt=$(STAGING_DIR) \
>  Markos>        --with-popt=$(STAGING_DIR)
> 
>  Markos> +ifeq ($(BR2_PACKAGE_OPENSSL),y)
>  Markos> +RPM_DEPENDENCIES += openssl
>  Markos> +RPM_CONF_OPT += --with-openssl=external
>  Markos> +else
>  Markos> +RPM_CONF_OPT += --with-openssl=no
>  Markos> +endif
> 
> Hmm, this makes sense but BR2_PACKAGE_RPM selects
> BR2_PACKAGE_OPENSSL. Is openssl optional? If so, please drop the select
> line in Config.in.
> 
> --
> Bye, Peter Korsgaard
> 

Hi Peter,

You are right. All it needs is the --with-openssl=external switch in
RPM_CONF_OPT. I will send a new patch asap.

Patch

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 9f42ee1..47c2ee9 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -17,6 +17,13 @@  RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
 	--with-libbeecrypt=$(STAGING_DIR) \
 	--with-popt=$(STAGING_DIR)
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+RPM_DEPENDENCIES += openssl
+RPM_CONF_OPT += --with-openssl=external
+else
+RPM_CONF_OPT += --with-openssl=no
+endif
+
 ifeq ($(BR2_PACKAGE_PCRE),y)
 RPM_DEPENDENCIES += pcre
 RPM_CONF_OPT += --with-pcre=external