Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
d3c4d9a0
Kaydet (Commit)
d3c4d9a0
authored
Tem 16, 2012
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
android: x86 porting work.
üst
e88f6ca6
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
205 additions
and
40 deletions
+205
-40
Makefile
android/experimental/LibreOffice4Android/Makefile
+13
-8
vtablefactory.hxx
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+1
-1
makefile.mk
bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+2
-1
configure.in
configure.in
+21
-8
LibreOfficeAndroidX86.conf
distro-configs/LibreOfficeAndroidX86.conf
+26
-0
Module_extensions.mk
extensions/Module_extensions.mk
+6
-1
icu4c-android.patch
icu/icu4c-android.patch
+2
-2
icu4c-build.patch
icu/icu4c-build.patch
+1
-1
makefile.mk
openldap/makefile.mk
+2
-2
lo-bootstrap.c
sal/android/lo-bootstrap.c
+17
-13
ANDROID_INTEL_GCC.mk
solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
+104
-0
unx.mk
solenv/inc/unx.mk
+4
-0
unxandr.mk
solenv/inc/unxandr.mk
+4
-0
CppunitTest_sw_filters_test.mk
sw/CppunitTest_sw_filters_test.mk
+1
-2
CppunitTest_sw_subsequent_odfimport.mk
sw/CppunitTest_sw_subsequent_odfimport.mk
+1
-1
No files found.
android/experimental/LibreOffice4Android/Makefile
Dosyayı görüntüle @
d3c4d9a0
...
@@ -16,8 +16,13 @@ APP_PACKAGE=org.libreoffice
...
@@ -16,8 +16,13 @@ APP_PACKAGE=org.libreoffice
# code are very much self-contained pre-packaged thingies.
# code are very much self-contained pre-packaged thingies.
APP_DATA_PATH
=
/data/data/
$(APP_PACKAGE)
APP_DATA_PATH
=
/data/data/
$(APP_PACKAGE)
SODEST
=
libs/armeabi-v7a
ifeq
($(CPU),I)
OBJLOCAL
=
obj/local/armeabi-v7a
ABI_PATH
=
x86
else
ABI_PATH
=
armeabi-v7a
endif
SODEST
=
libs/
$(ABI_PATH)
OBJLOCAL
=
obj/local/
$(ABI_PATH)
define
COPYSO
define
COPYSO
cp
$(1)
$(SODEST)$(if
$(2),/$(2))
&&
$(STRIP)
--strip-debug
$(SODEST)$(if
$(2),/$(2),/$(notdir
$(1)))
&&
\
cp
$(1)
$(SODEST)$(if
$(2),/$(2))
&&
$(STRIP)
--strip-debug
$(SODEST)$(if
$(2),/$(2),/$(notdir
$(1)))
&&
\
...
@@ -34,10 +39,10 @@ all: build-ant
...
@@ -34,10 +39,10 @@ all: build-ant
properties
:
properties
:
echo
sdk.dir
=
$(ANDROID_SDK_HOME)
>
local.properties
echo
sdk.dir
=
$(ANDROID_SDK_HOME)
>
local.properties
echo
sdk.dir
=
$(ANDROID_SDK_HOME)
>
../../Bootstrap/local.properties
echo
sdk.dir
=
$(ANDROID_SDK_HOME)
>
../../Bootstrap/local.properties
copy-stuff
:
copy-stuff
:
# First always clean
# First always clean
rm
-rf
libs
$(OBJLOCAL)
rm
-rf
libs
$(OBJLOCAL)
mkdir
-p
$(SODEST)
$(OBJLOCAL)
mkdir
-p
$(SODEST)
$(OBJLOCAL)
#
#
...
@@ -134,7 +139,7 @@ copy-stuff:
...
@@ -134,7 +139,7 @@ copy-stuff:
done
done
#
#
# Then the shared GNU C++ library
# Then the shared GNU C++ library
$(call
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/
armeabi-v7a
/libgnustl_shared.so)
$(call
COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/
$(ABI_PATH)
/libgnustl_shared.so)
#
#
# Then other "assets". Let the directory structure under assets mimic
# Then other "assets". Let the directory structure under assets mimic
# that under solver for now.
# that under solver for now.
...
@@ -234,7 +239,7 @@ copy-stuff:
...
@@ -234,7 +239,7 @@ copy-stuff:
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
#
#
cp
$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver
$(SODEST)
cp
$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver
$(SODEST)
echo
set
solib-search-path
./obj/local/
armeabi-v7a
>$(SODEST)/gdb.setup
echo
set
solib-search-path
./obj/local/
$(ABI_PATH)
>$(SODEST)/gdb.setup
build-ant
:
copy-stuff properties
build-ant
:
copy-stuff properties
#
#
...
@@ -269,4 +274,4 @@ run:
...
@@ -269,4 +274,4 @@ run:
clean
:
properties
clean
:
properties
$(ANT)
clean
$(ANT)
clean
rm
-rf
assets libs
$(SODEST)
$(OBJLOCAL)
rm
-rf
assets libs
obj
bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
Dosyayı görüntüle @
d3c4d9a0
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
/*See: http://people.redhat.com/drepper/selinux-mem.html*/
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
#if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \
|| defined(NETBSD) || defined(DRAGONFLY)
|| defined(NETBSD) || defined(DRAGONFLY)
|| defined (ANDROID)
#define USE_DOUBLE_MMAP
#define USE_DOUBLE_MMAP
#endif
#endif
...
...
bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -42,7 +42,8 @@ ENABLE_EXCEPTIONS=TRUE
...
@@ -42,7 +42,8 @@ ENABLE_EXCEPTIONS=TRUE
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCOPENBSDIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCOPENBSDIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCFREEBSDIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCFREEBSDIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCNETBSDIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCNETBSDIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCDRAGONFLYIgcc3"
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCDRAGONFLYIgcc3"
||
\
"$(COM)$(OS)$(CPU)$(COMNAME)"
==
"GCCANDROIDIgcc3"
||
\
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
# work with the .cxx sources in this directory:
...
...
configure.in
Dosyayı görüntüle @
d3c4d9a0
...
@@ -129,18 +129,25 @@ ANDROID_ARCH=
...
@@ -129,18 +129,25 @@ ANDROID_ARCH=
ANDROID_NDK_HOME=
ANDROID_NDK_HOME=
if test -n "$with_android_ndk"; then
if test -n "$with_android_ndk"; then
ANDROID_NDK_HOME=$with_android_ndk
ANDROID_NDK_HOME=$with_android_ndk
# Set up a lot of pre-canned defaults
# Set up a lot of pre-canned defaults
# What if the NDK at some point starts including several toolchains for different
# What if the NDK at some point starts including several toolchains for different
# gcc versions (like some 3rd-party improved NDK builds already do)?
# gcc versions (like some 3rd-party improved NDK builds already do)?
# Then the use of a wildcard below will break.
# Then the use of a wildcard below will break.
ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$with_android_arch-linux*/prebuilt/*/bin`
if test "$with_android_arch" = "arm"; then
ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$with_android_arch-linux*/prebuilt/*/bin`
android_gcc_prefix=arm-linux-androideabi
else
ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$with_android_arch-*/prebuilt/*/bin`
android_gcc_prefix=i686-android-linux
fi
test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$with_android_arch
test -z "$SYSBASE" && export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$with_android_arch
test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-ar
test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-ar
test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-nm
test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-nm
test -z "$OBJDUMP" && OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-objdump
test -z "$OBJDUMP" && OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-objdump
test -z "$RANLIB" && RANLIB=$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-ranlib
test -z "$RANLIB" && RANLIB=$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-ranlib
test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-strip
test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-strip
if test "$with_android_arch" = "arm"; then
if test "$with_android_arch" = "arm"; then
ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
...
@@ -149,8 +156,8 @@ if test -n "$with_android_ndk"; then
...
@@ -149,8 +156,8 @@ if test -n "$with_android_ndk"; then
ANDROIDCFLAGS="-march=atom --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-x86 -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86"
ANDROIDCFLAGS="-march=atom --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-x86 -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86"
ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include"
ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include"
fi
fi
test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-gcc $ANDROIDCFLAGS"
test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-gcc $ANDROIDCFLAGS"
test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/$
with_android_arch-linux-androideabi
-g++ $ANDROIDCXXFLAGS"
test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/$
android_gcc_prefix
-g++ $ANDROIDCXXFLAGS"
ANDROID_ARCH=$with_android_arch
ANDROID_ARCH=$with_android_arch
fi
fi
AC_SUBST(ANDROID_ARCH)
AC_SUBST(ANDROID_ARCH)
...
@@ -3318,6 +3325,12 @@ linux-androideabi*)
...
@@ -3318,6 +3325,12 @@ linux-androideabi*)
RTL_ARCH=ARM_EABI
RTL_ARCH=ARM_EABI
OUTPATH=unxandr
OUTPATH=unxandr
;;
;;
i*86)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
OUTPATH=unxandri
;;
*)
*)
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
;;
;;
...
...
distro-configs/LibreOfficeAndroidX86.conf
0 → 100644
Dosyayı görüntüle @
d3c4d9a0
--
host
=
i686
-
linux
-
androideabi
--
with
-
android
-
arch
=
x86
--
disable
-
cairo
-
canvas
--
disable
-
cups
--
disable
-
ext
-
pdfimport
--
disable
-
ext
-
presenter
-
console
--
disable
-
ext
-
presenter
-
minimizer
--
disable
-
ext
-
report
-
builder
--
disable
-
gconf
--
disable
-
gnome
-
vfs
--
disable
-
gstreamer
--
disable
-
lockdown
--
disable
-
mozilla
--
disable
-
odk
--
disable
-
opengl
--
disable
-
postgresql
-
sdbc
--
disable
-
python
--
disable
-
randr
--
disable
-
randr
-
link
--
disable
-
systray
--
disable
-
xmlsec
--
enable
-
mergelibs
--
enable
-
python
=
internal
--
without
-
junit
--
without
-
ppds
--
without
-
stlport
extensions/Module_extensions.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -32,12 +32,17 @@ $(eval $(call gb_Module_add_targets,extensions,\
...
@@ -32,12 +32,17 @@ $(eval $(call gb_Module_add_targets,extensions,\
AllLangResTarget_scn \
AllLangResTarget_scn \
AllLangResTarget_upd \
AllLangResTarget_upd \
Library_abp \
Library_abp \
Library_ldapbe2 \
Library_log \
Library_log \
Library_res \
Library_res \
Library_scn \
Library_scn \
))
))
ifneq ($(filter-out IOS ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,shell,\
Library_ldapbe2 \
))
endif
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,extensions,\
$(eval $(call gb_Module_add_targets,extensions,\
AllLangResTarget_bib \
AllLangResTarget_bib \
...
...
icu/icu4c-android.patch
Dosyayı görüntüle @
d3c4d9a0
...
@@ -24,8 +24,8 @@
...
@@ -24,8 +24,8 @@
# Check to see if genccode can generate simple assembly.
# Check to see if genccode can generate simple assembly.
GENCCODE_ASSEMBLY=
GENCCODE_ASSEMBLY=
case "${host}" in
case "${host}" in
+
*
-*-linux-androideabi)
+
arm
-*-linux-androideabi)
+ GENCCODE_ASSEMBLY="-a gcc-android"
+ GENCCODE_ASSEMBLY="-a gcc-android
-arm
"
+ ;;
+ ;;
*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
if test "$GCC" = yes; then
if test "$GCC" = yes; then
...
...
icu/icu4c-build.patch
Dosyayı görüntüle @
d3c4d9a0
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
".long ","",HEX_0X
".long ","",HEX_0X
},
},
+ {"gcc-android",
+ {"gcc-android
-arm
",
+ "\t.arch armv5te\n"
+ "\t.arch armv5te\n"
+ "\t.fpu softvfp\n"
+ "\t.fpu softvfp\n"
+ "\t.eabi_attribute 20, 1\n"
+ "\t.eabi_attribute 20, 1\n"
...
...
openldap/makefile.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -21,9 +21,9 @@ all:
...
@@ -21,9 +21,9 @@ all:
@
echo
"Therefore the version provided here does not need to be built in addition."
@
echo
"Therefore the version provided here does not need to be built in addition."
.ENDIF
.ENDIF
.IF
"$(OS)"
==
"WNT"
.IF
"$(OS)"
==
"WNT"
||
"$(OS)"
==
"ANDROID"
||
"$(OS)"
==
"IOS"
all
:
all
:
@
echo
"Openldap is not needed on Windows."
@
echo
"Openldap is not needed on Windows
, Android or iOS
."
.ENDIF
.ENDIF
# --- Files --------------------------------------------------------
# --- Files --------------------------------------------------------
...
...
sal/android/lo-bootstrap.c
Dosyayı görüntüle @
d3c4d9a0
...
@@ -1235,6 +1235,8 @@ lo_dlcall_argc_argv(void *function,
...
@@ -1235,6 +1235,8 @@ lo_dlcall_argc_argv(void *function,
return
result
;
return
result
;
}
}
#ifndef X86
/* There is a bug in std::type_info::operator== and
/* There is a bug in std::type_info::operator== and
* std::type_info::before() in libgnustl_shared.so in NDK r7 at
* std::type_info::before() in libgnustl_shared.so in NDK r7 at
* least. They compare the type name pointers instead of comparing the
* least. They compare the type name pointers instead of comparing the
...
@@ -1407,6 +1409,21 @@ patch_libgnustl_shared(void)
...
@@ -1407,6 +1409,21 @@ patch_libgnustl_shared(void)
&
replacement_method_before_arm
);
&
replacement_method_before_arm
);
}
}
// static native void patch_libgnustl_shared();
__attribute__
((
visibility
(
"default"
)))
void
Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared
(
JNIEnv
*
env
,
jobject
clazz
)
{
(
void
)
env
;
(
void
)
clazz
;
patch_libgnustl_shared
();
}
#endif // not X86
#define UNPACK_TREE "/assets/unpack"
#define UNPACK_TREE "/assets/unpack"
static
int
static
int
...
@@ -1520,19 +1537,6 @@ extract_files(const char *prefix)
...
@@ -1520,19 +1537,6 @@ extract_files(const char *prefix)
lo_apk_closedir
(
tree
);
lo_apk_closedir
(
tree
);
}
}
// static native void patch_libgnustl_shared();
__attribute__
((
visibility
(
"default"
)))
void
Java_org_libreoffice_android_Bootstrap_patch_1libgnustl_1shared
(
JNIEnv
*
env
,
jobject
clazz
)
{
(
void
)
env
;
(
void
)
clazz
;
patch_libgnustl_shared
();
}
// static native void extract_files();
// static native void extract_files();
__attribute__
((
visibility
(
"default"
)))
__attribute__
((
visibility
(
"default"
)))
...
...
solenv/gbuild/platform/ANDROID_INTEL_GCC.mk
0 → 100644
Dosyayı görüntüle @
d3c4d9a0
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
# (initial developer)
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DX86
gb_COMPILERDEFAULTOPTFLAGS := -Os
gb_CXXFLAGS += -fno-omit-frame-pointer
gb_CFLAGS += -fno-omit-frame-pointer
include $(GBUILDDIR)/platform/unxgcc.mk
# Link almost everything with -lgnustl_shared
gb_STDLIBS := \
gnustl_shared
gb_Library_PLAINLIBS_NONE := \
android \
gnustl_shared \
# No unit testing can be run
gb_CppunitTest_CPPTESTPRECOMMAND := :
# Re-define this from unxgcc.mk with some small but important
# changes. Just temporarily done this way, shm_get promised to
# eventually enable this to be done this in some more elegant and less
# redundant fashion.
gb_LinkTarget_LDFLAGS += \
-Wl,-z,defs \
-Wl,--as-needed \
-Wl,--no-add-needed
define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
-shared \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
$(LIBS) \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))))) \
-o $(1))
endef
# Prefix UNO library filenames with "lib"
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
# don't bother generating such.
define gb_Library_get_rpath
endef
define gb_Executable_get_rpath
endef
gb_LinkTarget_LDFLAGS := $(subst -Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
gb_Library__set_soversion_script_platform =
# vim: set noet sw=4:
solenv/inc/unx.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -95,6 +95,10 @@
...
@@ -95,6 +95,10 @@
.INCLUDE : unxandr.mk
.INCLUDE : unxandr.mk
.ENDIF
.ENDIF
.IF "$(COM)$(OS)$(CPU)" == "GCCANDROIDI"
.INCLUDE : unxandr.mk
.ENDIF
.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA"
.INCLUDE : unxlnga.mk
.INCLUDE : unxlnga.mk
.ENDIF
.ENDIF
...
...
solenv/inc/unxandr.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -29,7 +29,11 @@
...
@@ -29,7 +29,11 @@
CDEFAULTOPT=-Os
CDEFAULTOPT=-Os
.INCLUDE : unxgcc.mk
.INCLUDE : unxgcc.mk
.IF "$(CPU)" == "I"
CDEFS+=-DX86
.ELSE
CDEFS+=-DARM32
CDEFS+=-DARM32
.ENDIF
CFLAGS+=-fno-omit-frame-pointer
CFLAGS+=-fno-omit-frame-pointer
# Override some macros set by unxgcc.mk
# Override some macros set by unxgcc.mk
...
...
sw/CppunitTest_sw_filters_test.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -90,8 +90,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
...
@@ -90,8 +90,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
ucb/source/core/ucb1 \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
unoxml/source/service/unoxml \
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
xmlhelp/util/ucpchelp1) \
))
))
$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
...
...
sw/CppunitTest_sw_subsequent_odfimport.mk
Dosyayı görüntüle @
d3c4d9a0
...
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
...
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
ucb/source/ucp/file/ucpfile1 \
ucb/source/ucp/file/ucpfile1 \
unotools/util/utl \
unotools/util/utl \
unoxml/source/service/unoxml \
unoxml/source/service/unoxml \
xmlhelp/util/ucpchelp1
\
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1)
\
))
))
$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment