Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Port headless plugin to build on python2/python3

Browse Source 
The only thing needed is to port the buildsystem to not pass strings
starting with a "b" as build flags.
This commit is contained in:
Eli Schwartz 2019-02-21 01:09:08 -05:00
parent 2761fd5bd0
commit 3258c464e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/build_environment.py
View File

@ -111,8 +111,8 @@ def get_sip_dir():
pyqt['pyqt_sip_dir'] = get_sip_dir() pyqt['pyqt_sip_dir'] = get_sip_dir()
pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include')) pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include'))
glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux or ishaiku else '' glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).decode().strip() if islinux or ishaiku else ''
fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux or ishaiku else '' fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).decode().strip() if islinux or ishaiku else ''
qt_inc = pyqt['inc'] qt_inc = pyqt['inc']
qt_lib = pyqt['lib'] qt_lib = pyqt['lib']
ft_lib_dirs = [] ft_lib_dirs = []