Skip to content

Commit 5f035d2

Browse files
authored
[icu] Fix build on *BSD and Solaris (#49166)
1 parent 086a47a commit 5f035d2

File tree

5 files changed

+27
-1
lines changed

5 files changed

+27
-1
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/source/configure b/source/configure
2+
index d1b5812..7b93221 100755
3+
--- a/source/configure
4+
+++ b/source/configure
5+
@@ -7008,12 +7008,12 @@ printf %s "checking for genccode assembly... " >&6; }
6+
# Check to see if genccode can generate simple assembly.
7+
GENCCODE_ASSEMBLY=
8+
case "${host}" in
9+
-*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
10+
+*-linux*|*-kfreebsd*-gnu*|*86*-*bsd*|*86*-pc-gnu)
11+
if test "$GCC" = yes; then
12+
# We're using gcc, and the simple -a gcc command line works for genccode
13+
GENCCODE_ASSEMBLY="-a gcc"
14+
fi ;;
15+
-i*86-*-solaris*)
16+
+*86*-solaris*)
17+
if test "$GCC" = yes; then
18+
# When using gcc, look if we're also using GNU as.
19+
# When using GNU as, the simple -a gcc command line works for genccode.

ports/icu/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
99
ARCHIVE "${ARCHIVE}"
1010
PATCHES
1111
disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw.
12+
fix_bsd_and_solaris.patch
1213
fix_parallel_build_on_windows.patch
1314
mh-darwin.patch
1415
mh-mingw.patch

ports/icu/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "icu",
33
"version": "78.1",
4+
"port-version": 1,
45
"description": "Mature and widely used Unicode and localization library.",
56
"homepage": "https://icu.unicode.org/home",
67
"license": "ICU",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3846,7 +3846,7 @@
38463846
},
38473847
"icu": {
38483848
"baseline": "78.1",
3849-
"port-version": 0
3849+
"port-version": 1
38503850
},
38513851
"ideviceinstaller": {
38523852
"baseline": "2023-07-21",

versions/i-/icu.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "1fee992f7c429f4f5411338bede36139266337d4",
5+
"version": "78.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "283be8dda7e30d7082255f38b6f18fb16c5f80c0",
510
"version": "78.1",

0 commit comments

Comments
 (0)