8b517dfae3
This reverts commit 6517ce70e5.
Reason for revert:
<_rene__> noelgrandin: ping?
<_rene__> noelgrandin: /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/LinkTarget/StaticLibrary/libskia.a: error adding symbols: archive has no index; run ranlib to add one
<_rene__> noelgrandin: caused by your skia static library change. I think I pointed that out once already...
<_rene__> $ ld -v
<_rene__> GNU ld (GNU Binutils for Debian) 2.42
<noelgrandin> hmm, it's not an ld version issue, because I have ld 2.41
<_rene__> gcc version 13.2.0 (Debian 13.2.0-24)
<_rene__> and
<_rene__> Debian clang version 16.0.6 (27)
<_rene__> fwiw, too
<noelgrandin> is that a mergelibs build, or a regular build?
<_rene__> mergelibs
<_rene__> (the "normal" one, not =more)
<_rene__> noelgrandin: ... and LTO
<_rene__> noelgrandin: (saying because googling gives me https://github.com/mesonbuild/meson/issues/8371. and yes, .a is built with clang and the rest with gcc "of course")
<_rene__> noelgrandin: but the Linux release builds _do_ that:
<_rene__> $ grep -E "(lto|merge)" distro-configs/LibreOfficeLinux.conf
<_rene__> --enable-mergelibs
<_rene__> --enable-lto
<_rene__> $
<loircbot> LibreOffice (core) [libreoffice-7-6-7] lohmaier+LibreOffice · readlicense_oo/license/CREDITS.fodt · update credits
<noelgrandin> oh yeah, good spotting
<noelgrandin> yes, LTO is going to be a problem because skia is built with clang
Change-Id: I96c63109d2856c6e4cb22cf9ac945d4cfa9848c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167227
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Tested-by: Jenkins
154 lines
3.9 KiB
Makefile
154 lines
3.9 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,vclplug_gen))
|
|
|
|
$(eval $(call gb_Library_set_plugin_for,vclplug_gen,vcl))
|
|
|
|
$(eval $(call gb_Library_set_include,vclplug_gen,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/vcl/inc \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,vclplug_gen,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,vclplug_gen))
|
|
|
|
$(eval $(call gb_Library_use_common_precompiled_header,vclplug_gen))
|
|
|
|
$(eval $(call gb_Library_use_libraries,vclplug_gen,\
|
|
tl \
|
|
utl \
|
|
sot \
|
|
ucbhelper \
|
|
basegfx \
|
|
comphelper \
|
|
cppuhelper \
|
|
i18nlangtag \
|
|
i18nutil \
|
|
$(if $(ENABLE_JAVA), \
|
|
jvmaccess) \
|
|
cppu \
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,vclplug_gen,\
|
|
boost_headers \
|
|
cairo \
|
|
graphite \
|
|
epoxy \
|
|
expat \
|
|
harfbuzz \
|
|
icu_headers \
|
|
icuuc \
|
|
valgrind \
|
|
Xrender \
|
|
$(if $(filter SKIA,$(BUILD_TYPE)), \
|
|
skia \
|
|
fontconfig \
|
|
) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_libs,vclplug_gen,\
|
|
-lX11 \
|
|
-lXext \
|
|
-lSM \
|
|
-lICE \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
|
|
vcl/unx/generic/app/i18n_cb \
|
|
vcl/unx/generic/app/i18n_ic \
|
|
vcl/unx/generic/app/i18n_im \
|
|
vcl/unx/generic/app/i18n_keysym \
|
|
vcl/unx/generic/app/i18n_xkb \
|
|
vcl/unx/generic/app/keysymnames \
|
|
vcl/unx/generic/app/randrwrapper \
|
|
vcl/unx/generic/app/saldata \
|
|
vcl/unx/generic/app/saldisp \
|
|
vcl/unx/generic/app/salinst \
|
|
vcl/unx/generic/app/saltimer \
|
|
vcl/unx/generic/app/sm \
|
|
vcl/unx/generic/app/wmadaptor \
|
|
vcl/unx/generic/dtrans/bmp \
|
|
vcl/unx/generic/dtrans/config \
|
|
vcl/unx/generic/dtrans/X11_clipboard \
|
|
vcl/unx/generic/dtrans/X11_dndcontext \
|
|
vcl/unx/generic/dtrans/X11_droptarget \
|
|
vcl/unx/generic/dtrans/X11_selection \
|
|
vcl/unx/generic/dtrans/X11_service \
|
|
vcl/unx/generic/dtrans/X11_transferable \
|
|
vcl/unx/generic/gdi/cairo_xlib_cairo \
|
|
vcl/unx/generic/gdi/X11CairoSalGraphicsImpl \
|
|
vcl/unx/generic/gdi/font \
|
|
vcl/unx/generic/gdi/salgdi \
|
|
vcl/unx/generic/gdi/salvd \
|
|
vcl/unx/generic/window/salframe \
|
|
vcl/unx/generic/window/salobj \
|
|
vcl/unx/x11/x11sys \
|
|
vcl/unx/x11/xlimits \
|
|
vcl/source/opengl/x11/context \
|
|
$(if $(filter SKIA,$(BUILD_TYPE)), \
|
|
vcl/skia/x11/gdiimpl \
|
|
vcl/skia/x11/salvd \
|
|
vcl/skia/x11/textrender \
|
|
) \
|
|
))
|
|
|
|
# ultimately we want to split the x11 dependencies out
|
|
# into their own library I think.
|
|
|
|
$(eval $(call gb_Library_add_defs,vclplug_gen,\
|
|
-DVCLPLUG_GEN_IMPLEMENTATION \
|
|
-DVCL_INTERNALS \
|
|
))
|
|
|
|
## handle RandR
|
|
ifneq ($(ENABLE_RANDR),)
|
|
$(eval $(call gb_Library_use_externals,vclplug_gen,\
|
|
Xrandr \
|
|
))
|
|
$(eval $(call gb_Library_add_defs,vclplug_gen,\
|
|
-DUSE_RANDR \
|
|
))
|
|
endif
|
|
|
|
## handle Xinerama
|
|
ifneq ($(USING_X11),)
|
|
ifeq ($(XINERAMA_LINK),dynamic)
|
|
$(eval $(call gb_Library_add_libs,vclplug_gen,\
|
|
-lXinerama \
|
|
))
|
|
else
|
|
$(eval $(call gb_Library_add_libs,vclplug_gen,\
|
|
-Wl$(COMMA)-Bstatic -lXinerama -Wl$(COMMA)-Bdynamic \
|
|
))
|
|
endif
|
|
endif # USING_X11
|
|
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_Library_add_libs,vclplug_gen,\
|
|
-lm \
|
|
-ldl \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|