From 4007f69976d9876362c0100f9ddf898698334286 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Mon, 16 May 2022 19:21:44 +0430 Subject: Ports: Update libicu's patches to use git patches --- .../0001-Set-host-to-serenity-in-configure.patch | 25 +++++ .../0002-Add-a-serenity-specific-makefile.patch | 106 +++++++++++++++++++++ Ports/libicu/patches/ReadMe.md | 12 +++ Ports/libicu/patches/icu.patch | 103 -------------------- 4 files changed, 143 insertions(+), 103 deletions(-) create mode 100644 Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch create mode 100644 Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch create mode 100644 Ports/libicu/patches/ReadMe.md delete mode 100644 Ports/libicu/patches/icu.patch (limited to 'Ports/libicu') diff --git a/Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch b/Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch new file mode 100644 index 0000000000..2a9f0cc087 --- /dev/null +++ b/Ports/libicu/patches/0001-Set-host-to-serenity-in-configure.patch @@ -0,0 +1,25 @@ +From 8ab9c30e87cc95f6ad201eaa396c0ea2c62f9a41 Mon Sep 17 00:00:00 2001 +From: Gunnar Beutner +Date: Mon, 16 May 2022 18:03:31 +0430 +Subject: [PATCH 1/2] Set host to serenity in configure + +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index a2ff7e4..8283dc9 100755 +--- a/configure ++++ b/configure +@@ -5274,6 +5274,8 @@ x86_64-*-cygwin) + else + icu_cv_host_frag=mh-cygwin-msvc + fi ;; ++*-serenity*) ++ icu_cv_host_frag=mh-serenity ;; + *-*-mingw*) + if test "$GCC" = yes; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-- +2.36.1 + diff --git a/Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch b/Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch new file mode 100644 index 0000000000..418a410ac6 --- /dev/null +++ b/Ports/libicu/patches/0002-Add-a-serenity-specific-makefile.patch @@ -0,0 +1,106 @@ +From 6ff2bd5db3af8d810810f9cd46897f9ab148fb0b Mon Sep 17 00:00:00 2001 +From: Ali Mohammad Pur +Date: Mon, 16 May 2022 18:03:31 +0430 +Subject: [PATCH 2/2] Add a serenity-specific makefile + +--- + config/mh-serenity | 87 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 87 insertions(+) + create mode 100644 config/mh-serenity + +diff --git a/config/mh-serenity b/config/mh-serenity +new file mode 100644 +index 0000000..53d6780 +--- /dev/null ++++ b/config/mh-serenity +@@ -0,0 +1,87 @@ ++## -*-makefile-*- ++## Copyright (C) 2016 and later: Unicode, Inc. and others. ++## License & terms of use: http://www.unicode.org/copyright.html ++## Linux-specific setup ++## Copyright (c) 1999-2013, International Business Machines Corporation and ++## others. All Rights Reserved. ++ ++## Commands to generate dependency files ++GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) ++GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS) ++ ++## Flags for position independent code ++SHAREDLIBCFLAGS = -fPIC ++SHAREDLIBCXXFLAGS = -fPIC ++SHAREDLIBCPPFLAGS = -DPIC ++ ++## Additional flags when building libraries and with threads ++THREADSCPPFLAGS = -D_REENTRANT ++LIBCPPFLAGS = ++ ++## Compiler switch to embed a runtime search path ++LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN ++LD_RPATH_PRE = -Wl,-rpath, ++ ++## These are the library specific LDFLAGS ++LDFLAGSICUDT=-nodefaultlibs -nostdlib ++ ++## Compiler switch to embed a library name ++# The initial tab in the next line is to prevent icu-config from reading it. ++ LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) ++#SH# # We can't depend on MIDDLE_SO_TARGET being set. ++#SH# LD_SONAME= ++ ++## Shared library options ++LD_SOOPTIONS= -Wl,-Bsymbolic ++ ++## Shared object suffix ++SO = so ++## Non-shared intermediate object suffix ++STATIC_O = ao ++ ++## Compilation rules ++%.$(STATIC_O): $(srcdir)/%.c ++ $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -o $@ $<) ++%.o: $(srcdir)/%.c ++ $(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -o $@ $<) ++ ++%.$(STATIC_O): $(srcdir)/%.cpp ++ $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -o $@ $<) ++%.o: $(srcdir)/%.cpp ++ $(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -o $@ $<) ++ ++ ++## Dependency rules ++%.d: $(srcdir)/%.c ++ $(call ICU_MSG,(deps)) $< ++ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' ++ ++%.d: $(srcdir)/%.cpp ++ $(call ICU_MSG,(deps)) $< ++ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' ++ ++## Versioned libraries rules ++ ++%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) ++ $(RM) $@ && ln -s ${ $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+%.d: $(srcdir)/%.cpp -+ $(call ICU_MSG,(deps)) $< -+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+## Versioned libraries rules -+ -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${conftest.$ac_ext -- cgit v1.2.3