diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-23 11:28:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 07:28:16 +0000 |
| commit | 70bcf9e8bea1fee9cca44437730324ba7805b633 (patch) | |
| tree | d8d97927d773fd753ab569d1f0ace95917d14849 /desktop/scripts | |
| parent | 12a5e9bd92c0969051e035a4f2b7c18f0e3e79b5 (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 'desktop/scripts')
| -rwxr-xr-x | desktop/scripts/soffice.sh | 4 | ||||
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 17 |
2 files changed, 2 insertions, 19 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 67cc0b89751f..8866a2cc8cf1 100755 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -163,10 +163,6 @@ NetBSD|DragonFly) LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" export LD_LIBRARY_PATH ;; -AIX) - LIBPATH="$sd_prog${LIBPATH:+:$LIBPATH}" - export LIBPATH - ;; esac # restore locale setting, avoiding to export empty LC_ALL, s. tdf#130080 diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 3adf69c2e56e..de3823857fd2 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -49,10 +49,6 @@ NetBSD|FreeBSD|DragonFly) LD_LIBRARY_PATH="$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" export LD_LIBRARY_PATH ;; -AIX) - LIBPATH="$sd_prog${LIBPATH:+:${LIBPATH}}" - export LIBPATH - ;; esac for arg in "$@" @@ -72,17 +68,8 @@ if [ -x "${sd_prog}/javaldx" ] ; then my_path=$("${sd_prog}/javaldx" "$BOOTSTRAPVARS" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc") if [ -n "$my_path" ] ; then - sd_platform=$(uname -s) - case "$sd_platform" in - AIX) - LIBPATH="$my_path${LIBPATH:+:$LIBPATH}" - export LIBPATH - ;; - *) - LD_LIBRARY_PATH="$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export LD_LIBRARY_PATH - ;; - esac + LD_LIBRARY_PATH="$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH fi fi |