[PATCH] Fix typo in configure.ac (mk68 -> m68k)

John Paul Adrian Glaubitz glaubitz at physik.fu-berlin.de
Sun Nov 27 18:16:01 UTC 2016


Hi!

I maintain several unofficial architectures within Debian (Debian Ports),
one of them Debian m68k. Recently, enough progress was made in the m68k
port so that the buildds actually picked up the libreoffice source package
for building.

Unfortunately, the build bailed out with the following error:

> /usr/bin/ld: cannot find -ljawt

Looking at the compiler command line above, it's obvious why libjawt.so
was not found:

> S=/<<PKGBUILDDIR>> && I=$S/instdir && W=$S/workdir &&  m68k-linux-gnu-gcc -shared -Wl,-z,noexecstack   -Wl,-z,origin '-Wl,-rpath,$ORIGIN' -Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc  -Wl,--hash-style=gnu  -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo -Wl,-Bsymbolic-functions  -L$W/LinkTarget/StaticLibrary -L$I/sdk/lib  -L$I/program  -L$I/program -specs=/usr/share/dpkg/pie-link.specs -Wl,-z,relro   $W/CObject/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.o      -Wl,--start-group    -L/usr/lib/jvm/default-java/jre/lib/mk68 -ljawt  -Wl,--end-group -Wl,--no-as-needed  -o $I/program/libofficebean.so                                ^^^^
                                  This should be "m68k".

Looking at the configure.ac script, it's very obvious where this typo comes from:

> my_java_arch=mk68

This should be, of course:

> my_java_arch=m68k

The attached patch fixes the typo. This contribution is licensed under LGPL3+/
GPL3+/MPL1.1+, in case that even applies for such a trivial patch.

I will follow up with more patches if these should be necessary for m68k. I will
also have Gerrit properly set up for that in the future.

Thanks,
Adrian

--
 .''`.  John Paul Adrian Glaubitz
 : :' :  Debian Developer - glaubitz at debian.org
 `. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
   `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913



More information about the LibreOffice mailing list