Browse Source

Fixes for building pyqt

Signed-off-by: falkTX <falktx@falktx.com>
test-github-breakage
falkTX 7 months ago
parent
commit
f4bfd3d00a
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 15 additions and 3 deletions
  1. +15
    -3
      bootstrap-carla.sh

+ 15
- 3
bootstrap-carla.sh View File

@@ -55,14 +55,14 @@ fi
# custom function for sip and pyqt packages # custom function for sip and pyqt packages


function build_pyqt() { function build_pyqt() {
local name="${1}"
local pkgname="${1}"
local version="${2}" local version="${2}"
local extraconfrules="${3}" local extraconfrules="${3}"


local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
local pkgdir="${PAWPAW_BUILDDIR}/${pkgname}-${version}"
local python="python$(echo ${PYTHON_VERSION} | cut -b 1,2,3)" local python="python$(echo ${PYTHON_VERSION} | cut -b 1,2,3)"


_prebuild "${name}" "${pkgdir}"
_prebuild "${pkgname}" "${pkgdir}"


# remove flags not compatible with python # remove flags not compatible with python
export CFLAGS="$(echo ${CFLAGS} | sed -e 's/-fvisibility=hidden//')" export CFLAGS="$(echo ${CFLAGS} | sed -e 's/-fvisibility=hidden//')"
@@ -82,13 +82,19 @@ function build_pyqt() {
export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')" export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')"
export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fno-strict-aliasing -flto//')" export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fno-strict-aliasing -flto//')"


export CFLAGS="${CFLAGS} $(${PAWPAW_PREFIX}/bin/pkg-config --libs python3)"
export CXXFLAGS="${CXXFLAGS} $(${PAWPAW_PREFIX}/bin/pkg-config --libs python3)"

# non-standard vars used by sip/pyqt # non-standard vars used by sip/pyqt
export LDFLAGS="${LDFLAGS} $(${PAWPAW_PREFIX}/bin/pkg-config --libs python3)"
export LFLAGS="${LDFLAGS}" export LFLAGS="${LDFLAGS}"
export LINK="${CXX}" export LINK="${CXX}"


# add host/native binaries to path # add host/native binaries to path
if [ "${CROSS_COMPILING}" -eq 1 ]; then if [ "${CROSS_COMPILING}" -eq 1 ]; then
export PATH="${PAWPAW_PREFIX}-host/bin:${PATH}" export PATH="${PAWPAW_PREFIX}-host/bin:${PATH}"
elif [ "${LINUX}" -eq 1 ]; then
export LD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib"
fi fi


if [ ! -f "${pkgdir}/.stamp_configured" ]; then if [ ! -f "${pkgdir}/.stamp_configured" ]; then
@@ -141,6 +147,12 @@ function build_pyqt() {


unset LFLAGS unset LFLAGS
unset LINK unset LINK

if [ "${CROSS_COMPILING}" -eq 0 ] && [ "${LINUX}" -eq 1 ]; then
unset LD_LIBRARY_PATH
fi

_postbuild
} }


# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------


Loading…
Cancel
Save