Yes, this way is much better than replicating the LINUX part into SOLARIS.
I had to do the same on some other mk.
I'll send you the full patch zip as soon as I reach a full build with no errors.
----------------------------------------------------------------------------------
Da: Richard PALO
A: libreoffice
Data: 22 febbraio 2015 9.13.14 CET
Oggetto: Re: error during build of mork_helper, on illumos/xstreamos
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Le 21/02/15 08:29, Richard PALO a écrit :
In pkgsrc this is patched as follows:
$NetBSD: patch-vcl_Library__vcl.mk,v 1.1 2015/02/04 18:19:34 ryoon Exp $
--- vcl/Library_vcl.mk.orig 2015-01-22 20:05:28.000000000 +0000
+++ vcl/Library_vcl.mk
@@ -703,7 +703,7 @@ endif
endif
endif
-ifeq ($(OS),LINUX)
+ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_libs,vcl,\
-lm \
-ldl \
If this works for you, I'll prepare to upstream this patch.
The author of this patch responded to me that he'll upstream this himself as well as
a few others of the same sort (in pkgsrc) soon.
As to the '-Wl,-Bdirect' and '-Wl,-zdefs' in solaris.mk I'm testing if this passes, if so
I'll upstream that as well.. (builds/runs here without it, at least on gcc49)
As hoped, I had no fallout from this so will submit the reintegration of this bit to gerritt today.
- --
Richard PALO
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJU6Y+aAAoJECAB22fHtp27oOYIAIBtDwPr7U2HfCrbFNNSOsbU
zZZj+qfLv4DbLUm3ZdCS5zwYUwl/agEkltsO+tolzhTT6YFIMXqxNffMbFrITh9z
TmMu6PgR8JtXhnfzyWhT9gxNucNphKiwc2wwvWNDyxe5bOPYWIZTDtkGKWNbPjuE
+sLGGIZ7YBaiFazRww/3cFKy+YwmOyXBFCsS3LhHEw8bgn/UnwdA0kmgBsSkYmKw
YTwPd4iqm0kKis54jnr8CElzUb/Unzv6Sjz6JmNdbZc+OpSsQhFrela7IZJWSs7N
oNe2TmDZrNv8XGLTlsvipA4lZNCSWJ5fiPOp19NkX0YezrEFTFmP8uL3uL2w3hA=
=SRUy
-----END PGP SIGNATURE-----
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.