Skip to content

Commit 83b9faf

Browse files
authored
Feedback from #24426 (#24434)
1 parent 1206202 commit 83b9faf

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

test/test_other.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,6 +1094,7 @@ def test_pkg_config_packages(self):
10941094
@requires_pkg_config
10951095
@crossplatform
10961096
def test_pkg_config_ports(self):
1097+
# Use bullet here because it is part of the MINIMAL set of tasks in embuilder.
10971098
self.run_process([EMBUILDER, 'build', 'bullet'])
10981099
out = self.run_process([emmake, 'pkg-config', '--list-all'], stdout=PIPE).stdout
10991100
self.assertContained('bullet', out)

tools/ports/giflib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def get(ports, settings, shared):
1717
def create(final):
1818
source_path = ports.get_dir('giflib', f'giflib-{VERSION}')
1919
ports.install_headers(source_path)
20-
ports.make_pkg_config('giffix', VERSION, '-sUSE_GIFLIB')
20+
ports.make_pkg_config('giflib', VERSION, '-sUSE_GIFLIB')
2121
exclude_files = [
2222
'giffix.c', 'gifecho.c', 'giffilter.c', 'gifcolor.c', 'gifecho.c', 'gifinto.c',
2323
'gifsponge.c', 'gif2rgb.c', 'gifbg.c', 'gifbuild.c', 'gifclrmp.c', 'gifhisto.c',

tools/ports/icu.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ def create_libicu_common(lib_output):
6464
prepare_build()
6565
lib_src = os.path.join(icu_source_path, 'common')
6666
ports.install_headers(os.path.join(lib_src, 'unicode'), target='unicode')
67+
ports.make_pkg_config('ici', VERSION, '-sUSE_ICU')
6768
build_lib(lib_output, lib_src, [], ['-DU_COMMON_IMPLEMENTATION=1'])
6869

6970
# creator for libicu_stubdata

tools/ports/sdl2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import os
77

88
VERSION = '2.32.0'
9-
TAG = 'release-2.32.0'
9+
TAG = f'release-{VERSION}'
1010
HASH = 'd3e4ce9784152aa1194c4f2d2399829f3b01a652915afc6ddaec334068bf95d850edcb43b1a951e0202fc2ecaafc1f58e538ca39b9b16d3fdfe412af0b6aebb0'
11-
SUBDIR = 'SDL-' + TAG
11+
SUBDIR = f'SDL-{TAG}'
1212

1313
variants = {'sdl2-mt': {'PTHREADS': 1}}
1414

tools/ports/sdl3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
from tools import diagnostics
1111

1212
VERSION = '3.2.4'
13-
TAG = 'release-3.2.4'
13+
TAG = f'release-{VERSION}'
1414
HASH = 'c26a8afeec481e3ae3b435eec405d9f99d78752ebf5118963cd56728ceff23772769f5291df581329488da7489034e835301b08d61a42c811764e24b3542a4c2'
15-
SUBDIR = 'SDL-' + TAG
15+
SUBDIR = f'SDL-{TAG}'
1616

1717
variants = {'sdl3-mt': {'PTHREADS': 1}}
1818

0 commit comments

Comments
 (0)