1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
diff -ur icu.org/source/acinclude.m4 icu/source/acinclude.m4
--- icu.org/source/acinclude.m4 2020-04-10 16:22:16.000000000 +0200
+++ icu/source/acinclude.m4 2020-04-21 22:14:09.940217733 +0200
@@ -52,6 +52,12 @@
else
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
+aarch64-*-cygwin)
+ if test "$GCC" = yes; then
+ icu_cv_host_frag=mh-cygwin64
+ else
+ icu_cv_host_frag=mh-cygwin-msvc
+ fi ;;
*-*-mingw*)
if test "$GCC" = yes; then
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
diff -ur icu.org/source/configure.ac icu/source/configure.ac
--- icu.org/source/configure.ac 2020-04-10 16:22:16.000000000 +0200
+++ icu/source/configure.ac 2020-04-21 22:14:09.940217733 +0200
@@ -252,6 +252,23 @@
fi
fi
AC_SUBST(cross_buildroot)
+
+native_make="no"
+ENABLE_RELEASE=1
+AC_ARG_ENABLE(native-make,
+ [ --enable-native-make build with naive make (Cygwin only) [default=no]],
+ [ case "${enableval}" in
+ yes|"") native_make="yes" ;;
+ esac ],
+)
+
+cross_path_buildroot="$cross_buildroot"
+if test "x$native_make" = "xyes"; then
+ case "${host}" in
+ *-*-cygwin*) cross_path_buildroot=$(cygpath -u "$cross_buildroot") ;;
+ esac
+fi
+AC_SUBST(cross_path_buildroot)
# Check for doxygen to generate documentation
AC_PATH_PROG(DOXYGEN,doxygen,,$PATH:/usr/local/bin:/usr/bin)
diff -ur icu.org/source/icudefs.mk.in icu/source/icudefs.mk.in
--- icu.org/source/icudefs.mk.in 2020-04-10 16:22:16.000000000 +0200
+++ icu/source/icudefs.mk.in 2020-04-21 22:14:09.940217733 +0200
@@ -40,6 +40,7 @@
# controls the include of $(top_builddir)/icucross.mk at bottom of file
cross_compiling = @cross_compiling@
cross_buildroot = @cross_buildroot@
+cross_path_buildroot = @cross_path_buildroot@
# Package information
diff -ur icu.org/source/Makefile.in icu/source/Makefile.in
--- icu.org/source/Makefile.in 2020-04-10 16:22:16.000000000 +0200
+++ icu/source/Makefile.in 2020-04-21 22:14:09.940217733 +0200
@@ -90,15 +90,15 @@
echo "TOOLEXEEXT=$(EXEEXT)" \
) > $@
@(echo 'TOOLBINDIR=$$(cross_buildroot)/bin' ;\
- echo 'TOOLLIBDIR=$$(cross_buildroot)/lib' ;\
+ echo 'TOOLLIBDIR=$$(cross_path_buildroot)/lib' ;\
echo "INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(TOOLLIBDIR):$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$$$'"$(LDLIBRARYPATH_ENVVAR)" ;\
echo "PKGDATA_INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$(TOOLLIBDIR):$$$$'"$(LDLIBRARYPATH_ENVVAR) " ;\
echo ) >> $@
config/icucross.inc: $(top_builddir)/icudefs.mk $(top_builddir)/Makefile @platform_make_fragment@
@echo rebuilding $@
- @(grep '^CURR_FULL_DIR' $(top_builddir)/icudefs.mk ; \
- grep '^CURR_FULL_DIR' @platform_make_fragment@ || echo ""; \
+ @(grep '^CURR_FULL_DIR' @platform_make_fragment@ || echo ""; \
+ grep '^CURR_FULL_DIR' $(top_builddir)/icudefs.mk ; \
) > $@
config/icu.pc: $(srcdir)/config/icu.pc.in
|
