Browse Source

Fix pyqt builds not quite static

tags/v1.1
falkTX 4 years ago
parent
commit
4fc52b7dea
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 7 additions and 3 deletions
  1. +6
    -2
      bootstrap-carla.sh
  2. +1
    -1
      setup/env.sh

+ 6
- 2
bootstrap-carla.sh View File

@@ -119,6 +119,10 @@ function build_pyqt() {
export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-dead_strip -Wl,-dead_strip_dylibs//')" export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-dead_strip -Wl,-dead_strip_dylibs//')"
export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')" export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')"


if [ "${WIN32}" -eq 1 ]; then
export CXXFLAGS+=" -Wno-deprecated-copy"
fi

if [ ! -f "${pkgdir}/.stamp_configured" ]; then if [ ! -f "${pkgdir}/.stamp_configured" ]; then
pushd "${pkgdir}" pushd "${pkgdir}"


@@ -163,10 +167,10 @@ function build_pyqt() {


# fix win32 linkage # fix win32 linkage
if [ "${WIN32}" -eq 1 ]; then if [ "${WIN32}" -eq 1 ]; then
sed -i -e 's|config -lpython|config-3.8 -Wl,-Bdynamic -lpython|' */Makefile
sed -i -e 's|config -lpython3.8|config-3.8 -Wl,-Bdynamic -lpython3.8 -Wl,-Bstatic|' */Makefile
if [ -f "QtCore/Makefile.Release" ]; then if [ -f "QtCore/Makefile.Release" ]; then
for mak in $(find -maxdepth 2 -type f -name Makefile.Release); do for mak in $(find -maxdepth 2 -type f -name Makefile.Release); do
echo "LIBS += -L${PAWPAW_PREFIX}/lib/python3.8/config-3.8 -Wl,-Bdynamic -lpython3.8" >> ${mak}
echo "LIBS += -L${PAWPAW_PREFIX}/lib/python3.8/config-3.8 -Wl,-Bdynamic -lpython3.8 -Wl,-Bstatic" >> ${mak}
done done
fi fi
fi fi


+ 1
- 1
setup/env.sh View File

@@ -92,7 +92,7 @@ if [ "${MACOS}" -eq 1 ]; then
else else
LINK_FLAGS+=" -Wl,-O1 -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--strip-all" LINK_FLAGS+=" -Wl,-O1 -Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined -Wl,--strip-all"
if [ "${WIN32}" -eq 1 ]; then if [ "${WIN32}" -eq 1 ]; then
LINK_FLAGS+=" -static -Wl,-Bstatic"
LINK_FLAGS+=" -static -static-libgcc -static-libstdc++ -Wl,-Bstatic"
if [ "${CROSS_COMPILING}" -eq 0 ] && [ -e "/usr/lib/libssp.a" ]; then if [ "${CROSS_COMPILING}" -eq 0 ] && [ -e "/usr/lib/libssp.a" ]; then
LINK_FLAGS+=" -lssp" LINK_FLAGS+=" -lssp"
else else


Loading…
Cancel
Save