Skip to content

Commit 227e0fd

Browse files
authored
Merge pull request #79 from ManimCommunity/ignore-libs
Ignore unix like libraries on MSVC and other changes
2 parents 756dd2d + 835aa25 commit 227e0fd

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

packing/build_pango_mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build and install pango
33
set -e
44

5-
PANGO_VERSION=1.50.1
5+
PANGO_VERSION=1.50.5
66
GLIB_VERSION=2.70.2
77
CAIRO_VERSION=1.17.4
88
FONTCONFIG_VERSION=2.13.93

packing/build_pango_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build and install pango
33
set -e
44

5-
PANGO_VERSION=1.49.1
5+
PANGO_VERSION=1.50.5
66
GLIB_VERSION=2.67.6
77
FRIBIDI_VERSION=1.0.10
88
CAIRO_VERSION=1.17.4

packing/build_pkgconfig.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ if ($installationPath -and (test-path "$installationPath\Common7\Tools\vsdevcmd.
1919
set-content env:\"$name" $value
2020
}
2121
}
22+
python -m pip install 'pip==21.*'
2223
pip install --upgrade meson==0.55.3 ninja
2324
$env:PKG_CONFIG_PATH=""
2425
meson setup --prefix=$output --buildtype=release -Dtests=false pkg_conf_build pkgconf

packing/download_dlls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pathlib import Path
1313
from urllib.request import urlretrieve as download
1414

15-
PANGO_VERSION = "1.50.1"
15+
PANGO_VERSION = "1.50.5"
1616

1717

1818
def get_platform():

setup.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import shlex
66
import subprocess
77
import sys
8+
import sysconfig
89
import warnings
910
from pathlib import Path
1011
from shlex import quote
@@ -19,6 +20,11 @@
1920
except ImportError:
2021
USE_CYTHON = False
2122

23+
# Below is a set of libraries which shouldn't be linked
24+
# if we are using MSVC. Currently, pkg-config returns some of
25+
# these libraries when building using conda.
26+
IGNORE_LIBS_WIN = {"m", "c", "pthread", "dl", "rt"}
27+
2228
coverage = False
2329
if sys.argv[-1] == "--coverage":
2430
coverage = True
@@ -203,6 +209,10 @@ def update_dict(dict1: dict, dict2: dict):
203209
returns["libraries"] = NEEDED_LIBS
204210
if sys.platform == "win32":
205211
returns["libraries"] += ["Gdi32"]
212+
if not sysconfig.get_platform().startswith("mingw"): # MSVC compilers
213+
returns["libraries"] = list(
214+
set(returns["libraries"]).difference(IGNORE_LIBS_WIN)
215+
)
206216
if hasattr(returns, "define_macros"):
207217
returns["define_macros"] += [("UNICODE", 1)]
208218
else:

0 commit comments

Comments
 (0)