Patchwork scons: fix library installation directory

login
register
mail settings
Submitter Gustavo Zacarias
Date Oct. 9, 2012, 10:25 p.m.
Message ID <1349821556-17510-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/190498/
State Accepted
Headers show

Comments

Gustavo Zacarias - Oct. 9, 2012, 10:25 p.m.
On gentoo systems SCons setup.py tries to install into
$(HOST_DIR)/usr/lib64 but SCons looks up for its stuff in
$(HOST_DIR)/usr/lib instead hence breaking.
Make it install into $(HOST_DIR)/usr/lib by force to avoid the issue, it
shouldn't matter on other distributions.
Version bumping doesn't fix it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/scons/scons.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Peter Korsgaard - Oct. 11, 2012, 8:28 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> On gentoo systems SCons setup.py tries to install into
 Gustavo> $(HOST_DIR)/usr/lib64 but SCons looks up for its stuff in
 Gustavo> $(HOST_DIR)/usr/lib instead hence breaking.
 Gustavo> Make it install into $(HOST_DIR)/usr/lib by force to avoid the issue, it
 Gustavo> shouldn't matter on other distributions.
 Gustavo> Version bumping doesn't fix it.

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  package/scons/scons.mk |    2 +-
 Gustavo>  1 files changed, 1 insertions(+), 1 deletions(-)

 Gustavo> diff --git a/package/scons/scons.mk b/package/scons/scons.mk
 Gustavo> index 2aed62c..878dcba 100644
 Gustavo> --- a/package/scons/scons.mk
 Gustavo> +++ b/package/scons/scons.mk
 Gustavo> @@ -7,7 +7,7 @@ define HOST_SCONS_BUILD_CMDS
 Gustavo>  endef
 
 Gustavo>  define HOST_SCONS_INSTALL_CMDS
 Gustavo> -	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr)
 Gustavo> +	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION))

Committed with the line wrapped after ~80 chars, thanks.

Patch

diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index 2aed62c..878dcba 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -7,7 +7,7 @@  define HOST_SCONS_BUILD_CMDS
 endef
 
 define HOST_SCONS_INSTALL_CMDS
-	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr)
+	(cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION))
 endef
 
 $(eval $(host-generic-package))