Patchwork [02/10] libcurl: fix up prefix in curl-config

login
register
mail settings
Submitter Thomas Petazzoni
Date June 2, 2012, 4:13 p.m.
Message ID <9f69097a418b6d560a5b36463bdf6f02dd8c9c90.1338653505.git.thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/162428/
State Accepted
Headers show

Comments

Thomas Petazzoni - June 2, 2012, 4:13 p.m.
While most packages that rely on libcurl use pkg-config, a few
packages (such as libxmlrpc) still use curl-config. So we need to fix
up the prefix locations in the curl-config script installed in
STAGING_DIR.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/libcurl/libcurl.mk |    6 ++++++
 1 file changed, 6 insertions(+)
Peter Korsgaard - June 11, 2012, 8:36 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> While most packages that rely on libcurl use pkg-config, a few
 Thomas> packages (such as libxmlrpc) still use curl-config. So we need to fix
 Thomas> up the prefix locations in the curl-config script installed in
 Thomas> STAGING_DIR.

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/libcurl/libcurl.mk |    6 ++++++
 Thomas>  1 file changed, 6 insertions(+)

 Thomas> diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
 Thomas> index e8f13bb..e43ff0f 100644
 Thomas> --- a/package/libcurl/libcurl.mk
 Thomas> +++ b/package/libcurl/libcurl.mk
 Thomas> @@ -30,6 +30,12 @@ endef
 
 Thomas>  LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
 
 Thomas> +define LIBCURL_STAGING_FIXUP_CURL_CONFIG
 Thomas> +	$(SED) "s,prefix=,prefix=$(STAGING_DIR)," $(STAGING_DIR)/usr/bin/curl-config

For the other -config scripts we only replace if we match prefix=/usr to
ensure things don't get screwed up if this step is ever ran more than
once, so I fixed that - Committed, thanks.

Patch

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index e8f13bb..e43ff0f 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -30,6 +30,12 @@  endef
 
 LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
 
+define LIBCURL_STAGING_FIXUP_CURL_CONFIG
+	$(SED) "s,prefix=,prefix=$(STAGING_DIR)," $(STAGING_DIR)/usr/bin/curl-config
+endef
+
+LIBCURL_POST_INSTALL_STAGING_HOOKS += LIBCURL_STAGING_FIXUP_CURL_CONFIG
+
 $(eval $(call AUTOTARGETS))
 
 curl: libcurl