summaryrefslogtreecommitdiff
path: root/external/icu
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2023-01-23 11:28:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2023-01-27 07:28:16 +0000
commit70bcf9e8bea1fee9cca44437730324ba7805b633 (patch)
treed8d97927d773fd753ab569d1f0ace95917d14849 /external/icu
parent12a5e9bd92c0969051e035a4f2b7c18f0e3e79b5 (diff)
Remove support for AIX
As discussed in the mailing list thread starting at <https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html> "Plan to remove dead C++ UNO bridge implementations (bridges/source/cpp_uno/*)", the bridge implementation at bridges/source/cpp_uno/gcc3_aix_powerpc is apparently dead and should thus be removed. However, that was the only bridge implementation for AIX, which implies that support for the AIX platform as a whole is dead and should thus be removed. Change-Id: I96de3f7f97d4fd770ff78256f0ea435383688be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146057 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/icu')
-rw-r--r--external/icu/ExternalProject_icu.mk2
-rw-r--r--external/icu/UnpackedTarball_icu.mk1
-rw-r--r--external/icu/icu4c-aix.patch.1143
3 files changed, 1 insertions, 145 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 1fd0600fe5c6..5388eee58983 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -74,7 +74,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--disable-layout --disable-samples \
$(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \
$(if $(filter EMSCRIPTEN ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
- $(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
+ $(if $(filter SOLARIS,$(OS)),--disable-64bit-libs) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
--with-data-packaging=static --enable-static --disable-shared --disable-dyload,\
--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index f58223d5bc5f..b5b072b1e1e6 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,icu,0))
$(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-build.patch.1 \
- external/icu/icu4c-aix.patch.1 \
external/icu/icu4c-warnings.patch.1 \
external/icu/icu4c-macosx.patch.1 \
external/icu/icu4c-solarisgcc.patch.1 \
diff --git a/external/icu/icu4c-aix.patch.1 b/external/icu/icu4c-aix.patch.1
deleted file mode 100644
index bcbbe3ab9484..000000000000
--- a/external/icu/icu4c-aix.patch.1
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -ur icu.org/source/config/mh-aix-gcc icu/source/config/mh-aix-gcc
---- icu.org/source/config/mh-aix-gcc 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/config/mh-aix-gcc 2021-11-15 18:35:48.737774348 +0100
-@@ -18,84 +18,29 @@
- GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
- GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
-
--## Commands to link
--## We need to use the C++ linker, even when linking C programs, since
--## our libraries contain C++ code (C++ static init not called)
--LINK.c= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS)
--LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS)
--
--## Shared library options
--LD_SOOPTIONS= -Wl,-bsymbolic
--
--## Commands to make a shared library
--SHLIB.c= $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS)
--SHLIB.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS)
--
--## Compiler switch to embed a runtime search path
--LD_RPATH= -I
--LD_RPATH_PRE=
-+## Flags for position independent code
-+SHAREDLIBCFLAGS = -fPIC
-+SHAREDLIBCXXFLAGS = -fPIC
-+SHAREDLIBCPPFLAGS = -DPIC
-+
-+## Additional flags when building libraries and with threads
-+THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
-+LIBCPPFLAGS =
-
--## enable the shared lib loader
--LDFLAGS += -Wl,-bbigtoc
-+LD_RPATH=
-+LD_RPATH_PRE=
-
- ## These are the library specific LDFLAGS
- LDFLAGSICUDT=-nodefaultlibs -nostdlib
-
--## We need to delete things prior to linking, or else we'll get
--## SEVERE ERROR: output file in use .. on AIX.
--## But, shell script version should NOT delete target as we don't
--## have $@ in that context. (SH = only shell script, icu-config)
--AIX_PREDELETE=rm -f $@ ;
--#SH# AIX_PREDELETE=
--
- ## Environment variable to set a runtime search path
- LDLIBRARYPATH_ENVVAR = LIBPATH
-
--## Override Versioned target for a shared library.
--FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
--MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
--SHARED_OBJECT = $(notdir $(FINAL_SO_TARGET:.$(SO)=.$(SOBJ)))
--SHARED_OBJECT_NO_VERSION = $(basename $(SO_TARGET)).$(SOBJ)
--
--# The following is for Makefile.inc's use.
--ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
--
--# this one is for icudefs.mk's use
--ifeq ($(ENABLE_SHARED),YES)
--SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
--endif
--
--## Compiler switch to embed a library name. Not present on AIX.
--LD_SONAME =
--
--## The type of assembly needed when pkgdata is used for generating shared libraries.
--GENCCODE_ASSEMBLY=-a xlc
--
- ## Shared object suffix
--SOBJ= so
--# without the -brtl option, the library names use .a. AIX is funny that way.
--SO= a
--A= a
-+SO= so
-
- ## Non-shared intermediate object suffix
--STATIC_O = o
--
--## Special AIX rules
--
--## Build archive from shared object
--%.a : %.so
-- ln -f $< $(SHARED_OBJECT_NO_VERSION)
-- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION)
-- rm -f $(SHARED_OBJECT_NO_VERSION)
--$(LIBDIR)/%.a : %.so
-- ln -f $< $(SHARED_OBJECT_NO_VERSION)
-- $(AR) $(ARFLAGS) $@ $(SHARED_OBJECT_NO_VERSION)
-- rm -f $(SHARED_OBJECT_NO_VERSION)
--
--## Build import list from export list
--%.e : %.exp
-- @echo "Building an import list for $<"
-- @$(SHELL) -ec "echo '#! $*.a($*.so)' | cat - $< > $@"
-+STATIC_O = ao
-
- ## Compilation rules
- %.$(STATIC_O): $(srcdir)/%.c
-@@ -123,10 +68,10 @@
- [ -s $@ ] || rm -f $@'
-
- ## Versioned libraries rules
--%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
-- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
--%.$(SO): %$(SO_TARGET_VERSION).$(SO)
-- $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@
-+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-+ $(RM) $@ && ln -s ${<F} $@
-+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-+ $(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
-
-
- ## BIR - bind with internal references [so app data and icu data doesn't collide]
-diff -ur icu.org/source/tools/pkgdata/pkgdata.cpp icu/source/tools/pkgdata/pkgdata.cpp
---- icu.org/source/tools/pkgdata/pkgdata.cpp 2021-10-28 18:04:57.000000000 +0200
-+++ icu/source/tools/pkgdata/pkgdata.cpp 2021-11-15 18:28:38.342143852 +0100
-@@ -959,7 +959,7 @@
-
- uprv_strcat(pkgDataFlags[SO_EXT], ".");
- uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]);
--#elif U_PLATFORM == U_PF_OS400 || defined(_AIX)
-+#elif U_PLATFORM == U_PF_OS400
- sprintf(libFileNames[LIB_FILE_VERSION_TMP], "%s%s%s",
- libFileNames[LIB_FILE],
- FILE_EXTENSION_SEP,
-@@ -1439,15 +1439,6 @@
- pkgDataFlags[LDICUDTFLAGS],
- targetDir,
- libFileNames[LIB_FILE_CYGWIN_VERSION],
--#elif U_PLATFORM == U_PF_AIX
-- sprintf(cmd, "%s %s%s;%s %s -o %s%s %s %s%s %s %s",
-- RM_CMD,
-- targetDir,
-- libFileNames[LIB_FILE_VERSION_TMP],
-- pkgDataFlags[GENLIB],
-- pkgDataFlags[LDICUDTFLAGS],
-- targetDir,
-- libFileNames[LIB_FILE_VERSION_TMP],
- #else
- sprintf(cmd, "%s %s -o %s%s %s %s%s %s %s",
- pkgDataFlags[GENLIB],