1*4882a593SmuzhiyunFrom 732fd31610a6790a927ea9ed6d660796a1641254 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Baruch Siach <baruch@tkos.co.il> 3*4882a593SmuzhiyunDate: Thu, 7 Sep 2017 08:12:01 +0200 4*4882a593SmuzhiyunSubject: [PATCH] build: Fix lirc version detection when cross compiling. 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe setup.py script that runs on the host can't use the client library 7*4882a593Smuzhiyunbuilt for target. So setup.py falls back to a wrong hard-coded VERSION 8*4882a593Smuzhiyunvalue. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunInstead of importing the target library, use exec() to read 11*4882a593Smuzhiyunlirc/config.py directly for its VERSION value. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunFixes build failure: 14*4882a593Smuzhiyun 15*4882a593Smuzhiyun/usr/bin/install -c -m 644 ./python-pkg/dist/lirc-0.10.0.tar.gz \ 16*4882a593Smuzhiyun '.../output/host/arm-buildroot-linux-musleabihf/sysroot/usr/share/lirc' 17*4882a593Smuzhiyun/usr/bin/install: cannot stat './python-pkg/dist/lirc-0.10.0.tar.gz': \ 18*4882a593Smuzhiyun No such file or directory 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunSigned-off-by: Baruch Siach <baruch@tkos.co.il> 21*4882a593Smuzhiyun--- 22*4882a593SmuzhiyunUpstream status: commit 732fd31610a6 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun python-pkg/setup.py | 9 +++------ 25*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 6 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/python-pkg/setup.py b/python-pkg/setup.py 28*4882a593Smuzhiyunindex e9b33690f828..a2d92e0432aa 100644 29*4882a593Smuzhiyun--- a/python-pkg/setup.py 30*4882a593Smuzhiyun+++ b/python-pkg/setup.py 31*4882a593Smuzhiyun@@ -6,14 +6,11 @@ import subprocess 32*4882a593Smuzhiyun import os.path 33*4882a593Smuzhiyun import os 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun-try: 36*4882a593Smuzhiyun- import lirc.config 37*4882a593Smuzhiyun- VERSION = lirc.config.VERSION.replace('-devel','') 38*4882a593Smuzhiyun-except ImportError: 39*4882a593Smuzhiyun- VERSION='0.0.0' 40*4882a593Smuzhiyun- 41*4882a593Smuzhiyun from setuptools import setup, Extension 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun+exec(open("lirc/config.py").read()) 44*4882a593Smuzhiyun+VERSION = VERSION.replace('-devel','') 45*4882a593Smuzhiyun+ 46*4882a593Smuzhiyun if 'CFLAGS' in os.environ: 47*4882a593Smuzhiyun cflags = os.environ['CFLAGS'].split() 48*4882a593Smuzhiyun if 'LDFLAGS' in os.environ: 49*4882a593Smuzhiyun-- 50*4882a593Smuzhiyun2.14.1 51*4882a593Smuzhiyun 52