Skip to contentSkip to conversation

Fix: qt5webkit overwrites target python.

PATCH Superseded johanderycke at gmail.com 3 participants 3 messages Oct 19, 2016

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Fix: qt5webkit overwrites target python.

From: Johan Derycke <[email protected]>

---
Changes v1 -> v2:
- simpler fix suggested by Thomas

 package/qt5/qt5webkit/qt5webkit.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
package/qt5/qt5webkit/qt5webkit.mk +3 -3
index f300c11..378cdf7 100644
@@ -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
 
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 Fix: qt5webkit overwrites target python.

Hello,

Quoted 3 lines · johanderycke at gmail.com

From: Johan Derycke <[email protected]>

This really requires a more detailed commit log.

package/qt5/qt5webkit/qt5webkit.mk endif · line 43

Quoted 8 lines
package/qt5/qt5webkit/qt5webkit.mk +3 -3
-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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH v2 1/1 Fix: qt5webkit overwrites target python.

Quoted 6 lines · Thomas Petazzoni

Hello,

Quoted 3 lines · johanderycke at gmail.com

From: Johan Derycke <[email protected]>

Quoted 22 lines

This really requires a more detailed commit log.

package/qt5/qt5webkit/qt5webkit.mk endif · line 43

Quoted 8 lines
package/qt5/qt5webkit/qt5webkit.mk +3 -3
-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 at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot