Skip to content

Commit

Permalink
Additional overlay ports
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkvdb committed Feb 19, 2025
1 parent 68191de commit 4d68c5d
Show file tree
Hide file tree
Showing 20 changed files with 876 additions and 0 deletions.
17 changes: 17 additions & 0 deletions vcpkg_overlay/ports/icu/disable-escapestr-tool.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/source/tools/Makefile.in b/source/tools/Makefile.in
index e0896f1..5ead980 100644
--- a/source/tools/Makefile.in
+++ b/source/tools/Makefile.in
@@ -19,9 +19,9 @@ SUBDIRS = toolutil ctestfw makeconv genrb genbrk \
gencnval gensprep icuinfo genccode gencmn icupkg pkgdata \
gentest gennorm2 gencfu gendict icuexportdata

-ifneq (@platform_make_fragment_name@,mh-cygwin-msvc)
-SUBDIRS += escapesrc
-endif
+#ifneq (@platform_make_fragment_name@,mh-cygwin-msvc)
+#SUBDIRS += escapesrc
+#endif

## List of phony targets
.PHONY : all all-local all-recursive install install-local \
20 changes: 20 additions & 0 deletions vcpkg_overlay/ports/icu/disable-static-prefix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/source/icudefs.mk.in b/source/icudefs.mk.in
index 24bd97a..33169de 100644
--- a/source/icudefs.mk.in
+++ b/source/icudefs.mk.in
@@ -213,13 +213,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)

## If we can't use the shared libraries, use the static libraries
ifneq ($(ENABLE_SHARED),YES)
-STATIC_PREFIX_WHEN_USED = s
+STATIC_PREFIX_WHEN_USED =
else
STATIC_PREFIX_WHEN_USED =
endif

# Static library prefix and file extension
-STATIC_PREFIX = s
+STATIC_PREFIX =
LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
A = a
SOBJ = $(SO)
20 changes: 20 additions & 0 deletions vcpkg_overlay/ports/icu/filters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"localeFilter": {
"filterType": "language",
"includelist": [
"en",
"nl",
"fr"
]
},
"featureFilters": {
"brkitr_dictionaries": "exclude",
"curr_tree": "exclude",
"curr_supplemental": "exclude",
"zone_tree": "exclude",
"zone_supplemental": "exclude",
"region_tree": "exclude",
"unit_tree": "exclude"
}
}

13 changes: 13 additions & 0 deletions vcpkg_overlay/ports/icu/fix-extra.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --urN a/source/extra/Makefile.in b/source/extra/Makefile.in
--- a/source/extra/Makefile.in
+++ b/source/extra/Makefile.in
@@ -23,7 +23,7 @@
## Files to remove for 'make clean'
CLEANFILES = *~

-SUBDIRS = scrptrun uconv
+SUBDIRS = uconv

## List of phony targets
.PHONY : all all-local all-recursive install install-local \

35 changes: 35 additions & 0 deletions vcpkg_overlay/ports/icu/fix-win-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/source/configure.ac b/source/configure.ac
index 425fdc7..97210f8 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -114,6 +114,15 @@ AC_ARG_ENABLE([icu-config],
esac], [enable_icu_config=true])
AC_SUBST(INSTALL_ICU_CONFIG, [$enable_icu_config])

+AC_ARG_ENABLE([icu-build-win],
+ AS_HELP_STRING([--enable-icu-build-win], [install icu-build-win]),
+ [case "${enableval}" in
+ yes) enable_icu_build_win=true ;;
+ no) enable_icu_build_win=false ;;
+ *) AC_MSG_ERROR([bad value '${enableval}' for --enable-icu-build-win]) ;;
+ esac], [enable_icu_build_win=true])
+AC_SUBST(INSTALL_ICU_BUILD_WIN, [$enable_icu_build_win])
+
# Check whether to build debug libraries
AC_MSG_CHECKING([whether to build debug libraries])
enabled=no
@@ -263,12 +272,14 @@ ICU_CHECK_MH_FRAG
# Checks for libraries and other host specific stuff
# On HP/UX, don't link to -lm from a shared lib because it isn't
# PIC (at least on 10.2)
+if test "$enable_icu_build_win" = no; then
case "${host}" in
*-*-hpux*) AC_CHECK_LIB(m, floor, LIB_M="-lm") ;;

*) AC_CHECK_LIB(m, floor)
LIB_M="" ;;
esac
+fi
AC_SUBST(LIB_M)

# Check whether to build shared libraries
25 changes: 25 additions & 0 deletions vcpkg_overlay/ports/icu/fix_parallel_build_on_windows.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --urN a/source/data/Makefile.in b/source/data/Makefile.in
--- a/source/data/Makefile.in
+++ b/source/data/Makefile.in
@@ -236,11 +236,12 @@
## Include the main build rules for data files
include $(top_builddir)/$(subdir)/rules.mk

+PKGDATA_LIST = $(TMP_DIR)/icudata.lst

ifeq ($(ENABLE_SO_VERSION_DATA),1)
ifeq ($(PKGDATA_MODE),dll)
SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
-$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | $(TMP_DIR)/dirs.timestamp
+$(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc $(PKGDATA_LIST)
ifeq ($(MSYS_RC_MODE),1)
rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
else
@@ -249,7 +250,6 @@
endif
endif

-PKGDATA_LIST = $(TMP_DIR)/icudata.lst


#####################################################
26 changes: 26 additions & 0 deletions vcpkg_overlay/ports/icu/mingw-dll-install.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/source/config/mh-mingw b/source/config/mh-mingw
index 30f6e5be81..b6364551ea 100644
--- a/source/config/mh-mingw
+++ b/source/config/mh-mingw
@@ -13,7 +13,7 @@
# On Windows we generally have the DLLs in the bin directory rather than the lib directory.
# This setting moves the ICU DLLs into the bin folder for MinGW/MSYS2 when "make install" is run.
# If you prefer to have the DLLs in the lib folder, then set this to NO instead.
-MINGW_MOVEDLLSTOBINDIR = YES
+MINGW_MOVEDLLSTOBINDIR = NO

# We install sbin tools into the same bin directory because
# pkgdata needs some of the tools in sbin, and we can't always depend on
diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64
index fb64c56260..a43cc4dd71 100644
--- a/source/config/mh-mingw64
+++ b/source/config/mh-mingw64
@@ -10,7 +10,7 @@
# On Windows we generally have the DLLs in the bin directory rather than the lib directory.
# This setting moves the ICU DLLs into the bin folder for MinGW/MSYS2 when "make install" is run.
# If you prefer to have the DLLs in the lib folder, then set this to NO instead.
-MINGW_MOVEDLLSTOBINDIR = YES
+MINGW_MOVEDLLSTOBINDIR = NO

# This file is similar to mh-mingw
# Any changes made here may also need to be made in mh-mingw
Loading

0 comments on commit 4d68c5d

Please sign in to comment.