diff mbox

[V2,1/1] Fix: qt5webkit overwrites target python.

Message ID 1476877746-13572-1-git-send-email-johanderycke@gmail.com
State Superseded
Headers show

Commit Message

Johan Derycke Oct. 19, 2016, 11:49 a.m. UTC 
From: Johan Derycke <johan.derycke@barco.com>

Signed-off-by: Johan Derycke <johan.derycke@barco.com>
---
Changes v1 -> v2:
- simpler fix suggested by Thomas

 package/qt5/qt5webkit/qt5webkit.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni Oct. 19, 2016, 1:01 p.m. UTC | #1 
Hello,

On Wed, 19 Oct 2016 13:49:06 +0200, johanderycke@gmail.com wrote:
> From: Johan Derycke <johan.derycke@barco.com>
> 
> Signed-off-by: Johan Derycke <johan.derycke@barco.com>

This really requires a more detailed commit log.

> -QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH)
> +QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
>  define QT5WEBKIT_PYTHON2_SYMLINK
> -	mkdir -p $(@D)/bin
> -	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
> +	mkdir -p $(@D)/host-bin
> +	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
>  endef

Otherwise, this looks good.

Thomas
Yegor Yefremov Oct. 19, 2016, 1:41 p.m. UTC | #2 
On Wed, Oct 19, 2016 at 3:01 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Wed, 19 Oct 2016 13:49:06 +0200, johanderycke@gmail.com wrote:
>> From: Johan Derycke <johan.derycke@barco.com>
>>
>> Signed-off-by: Johan Derycke <johan.derycke@barco.com>

Tested-by: Yegor Yefremov <yegorslists@googlemail.com>

> This really requires a more detailed commit log.
>
>> -QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH)
>> +QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
>>  define QT5WEBKIT_PYTHON2_SYMLINK
>> -     mkdir -p $(@D)/bin
>> -     ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
>> +     mkdir -p $(@D)/host-bin
>> +     ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
>>  endef
>
> Otherwise, this looks good.
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox

Patch

diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index f300c11..378cdf7 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -36,10 +36,10 @@  endif
 # QtWebkit's build system uses python, but only supports python2. We work
 # around this by forcing python2 early in the PATH, via a python->python2
 # symlink.
-QT5WEBKIT_ENV = PATH=$(@D)/bin:$(BR_PATH)
+QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
 define QT5WEBKIT_PYTHON2_SYMLINK
-	mkdir -p $(@D)/bin
-	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
+	mkdir -p $(@D)/host-bin
+	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
 endef
 QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK