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 /odk | |
| 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 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 3 | ||||
| -rw-r--r-- | odk/source/unoapploader/unx/unoapploader.c | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index e77b1fb09d87..98d31c3a9c5e 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -21,8 +21,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\ $(if $(filter NETBSD,$(OS)),netbsd,\ $(if $(filter FREEBSD,$(OS)),freebsd,\ $(if $(filter DRAGONFLY,$(OS)),dragonfly,\ - $(if $(filter MACOSX,$(OS)),macosx,\ - $(if $(filter AIX,$(OS)),aix)))))))) + $(if $(filter MACOSX,$(OS)),macosx))))))) .PHONY: $(call gb_CustomTarget_get_workdir,odk/check)/checkbin $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ diff --git a/odk/source/unoapploader/unx/unoapploader.c b/odk/source/unoapploader/unx/unoapploader.c index 3a35599292be..cc83b88bfaf2 100644 --- a/odk/source/unoapploader/unx/unoapploader.c +++ b/odk/source/unoapploader/unx/unoapploader.c @@ -75,8 +75,6 @@ int main( int argc, char *argv[] ) { #if defined(MACOSX) static const char* ENVVARNAME = "DYLD_LIBRARY_PATH"; -#elif defined(AIX) - static const char* ENVVARNAME = "LIBPATH"; #else static const char* ENVVARNAME = "LD_LIBRARY_PATH"; #endif @@ -263,14 +261,11 @@ char* createCommandName( char* argv0 ) char* cmdname = NULL; char* sep = NULL; -#ifndef AIX Dl_info dl_info; -#endif /* get the executable file name from argv0 */ prgname = argv0; -#ifndef AIX /* * if argv0 doesn't contain an absolute path name, try to get the absolute * path name from dladdr; note that this only works for Solaris, not for @@ -282,7 +277,6 @@ char* createCommandName( char* argv0 ) { prgname = dl_info.dli_fname; } -#endif /* prefix the executable file name by '_' */ if ( prgname != NULL ) |