diff options
Diffstat (limited to '0007-actually-move-to-bin.mingw.patch')
| -rw-r--r-- | 0007-actually-move-to-bin.mingw.patch | 168 |
1 files changed, 168 insertions, 0 deletions
diff --git a/0007-actually-move-to-bin.mingw.patch b/0007-actually-move-to-bin.mingw.patch new file mode 100644 index 000000000000..4fd9fd682f5d --- /dev/null +++ b/0007-actually-move-to-bin.mingw.patch @@ -0,0 +1,168 @@ +diff -Naur icu-orig/source/common/Makefile.in icu/source/common/Makefile.in +--- icu-orig/source/common/Makefile.in 2016-09-09 19:41:15.000000000 +0300 ++++ icu/source/common/Makefile.in 2018-03-01 10:09:13.513016200 +0300 +@@ -147,16 +147,16 @@ + install-local: install-headers install-library + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) +diff -Naur icu-orig/source/i18n/Makefile.in icu/source/i18n/Makefile.in +--- icu-orig/source/i18n/Makefile.in 2016-09-14 01:15:13.000000000 +0300 ++++ icu/source/i18n/Makefile.in 2018-03-01 10:09:13.528616200 +0300 +@@ -135,16 +135,16 @@ + install-local: install-headers install-library + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) +diff -Naur icu-orig/source/io/Makefile.in icu/source/io/Makefile.in +--- icu-orig/source/io/Makefile.in 2016-06-15 21:58:17.000000000 +0300 ++++ icu/source/io/Makefile.in 2018-03-01 10:09:13.825016700 +0300 +@@ -96,16 +96,16 @@ + install-local: install-headers install-library + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) +diff -Naur icu-orig/source/layoutex/Makefile.in icu/source/layoutex/Makefile.in +--- icu-orig/source/layoutex/Makefile.in 2016-06-15 21:58:17.000000000 +0300 ++++ icu/source/layoutex/Makefile.in 2018-03-01 10:09:13.856216800 +0300 +@@ -109,16 +109,16 @@ + endif + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) +diff -Naur icu-orig/source/stubdata/Makefile.in icu/source/stubdata/Makefile.in +--- icu-orig/source/stubdata/Makefile.in 2016-06-15 21:58:17.000000000 +0300 ++++ icu/source/stubdata/Makefile.in 2018-03-01 10:09:13.887416800 +0300 +@@ -82,16 +82,16 @@ + install-local: install-library + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) +diff -Naur icu-orig/source/tools/ctestfw/Makefile.in icu/source/tools/ctestfw/Makefile.in +--- icu-orig/source/tools/ctestfw/Makefile.in 2016-06-15 21:58:17.000000000 +0300 ++++ icu/source/tools/ctestfw/Makefile.in 2018-03-01 10:09:13.918616900 +0300 +@@ -78,16 +78,16 @@ + install-local: install-library + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) +diff -Naur icu-orig/source/tools/toolutil/Makefile.in icu/source/tools/toolutil/Makefile.in +--- icu-orig/source/tools/toolutil/Makefile.in 2016-06-15 21:58:17.000000000 +0300 ++++ icu/source/tools/toolutil/Makefile.in 2018-03-01 10:09:13.981017000 +0300 +@@ -89,16 +89,16 @@ + install-local: install-library + + install-library: all-local +- $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) + ifneq ($(ENABLE_STATIC),) + $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir) + endif + ifneq ($(ENABLE_SHARED),) +- $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir) ++ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(bindir) + ifneq ($(FINAL_SO_TARGET),$(SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET)) + ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET)) +- cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) ++ cd $(DESTDIR)$(bindir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET)) + endif + endif + ifneq ($(IMPORT_LIB_EXT),) |