strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gbuild: rename value OS=IOS to OS=iOS

Browse source 
This gets rid of the horrible hack in gbuild.mk to accomodate the
case-incorrect iOS platform makefiles that cannot be renamed without
upsetting git on file systems that sadly lack the case sensitivity
feature.

Keep the macro defined to IOS though.

Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234
Reviewed-on: https://gerrit.libreoffice.org/62705
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Michael Stahl 2018-10-31 19:06:30 +01:00 committed by Tor Lillqvist
parent 4bd701a306
commit a626bdd56d
50 changed files with 82 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -178,7 +178,7 @@ clean-host:
rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(WORKDIR)
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
rm -fr $(SRCDIR)/ios/generated
endif
@ -284,7 +284,7 @@ build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \
$(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \
install-gdb-printers
$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
endif
@ -295,13 +295,13 @@ help showmodules gbuildtojson:
cross-toolset: bootstrap fetch
# fetch again in case there are externals only needed on build platform
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(BUILDDIR)/Makefile fetch
endif
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools
install-gdb-printers:
ifneq ($(filter-out WNT MACOSX IOS,$(OS)),)
ifneq ($(filter-out WNT MACOSX iOS,$(OS)),)
mkdir -p $(INSTDIR)
$(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c
endif

6
Repository.mk
View file

@ -37,7 +37,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
helpex \
idxdict \
langsupport \
$(if $(filter IOS,$(OS)),LibreOffice) \
$(if $(filter iOS,$(OS)),LibreOffice) \
libtest \
lngconvex \
localize \
@ -62,7 +62,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
unoidl-read \
unoidl-write \
xrmex \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \
$(if $(filter-out ANDROID iOS WNT,$(OS)), \
svdemo \
fftester \
svptest \
@ -141,7 +141,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
$(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \
$(if $(filter-out ANDROID HAIKU iOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
$(if $(filter WNT,$(OS)), \

4
bin/lo-all-static-libs
View file

@ -13,7 +13,7 @@ if test -z "$INSTDIR" ; then
exit 1
fi
if test "$OS" != ANDROID -a "$OS" != IOS; then
if test "$OS" != ANDROID -a "$OS" != iOS; then
echo This script makes sense only in Android or iOS builds.
fi
@ -56,7 +56,7 @@ ANDROID)
oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a"
;;
IOS)
iOS)
oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
oslibs="$oslibs $WORKDIR/UnpackedTarball/cppunit/src/cppunit/.libs/*.a"
;;

6
bin/update_pch
View file

@ -572,7 +572,7 @@ def process_makefile(root, module, makefile):
if not os.path.isfile(filename):
sys.stderr.write('Error: Module {} has no makefile at {}.'.format(module, filename))
groups = {'':[], 'ANDROID':[], 'IOS':[], 'WNT':[], 'LINUX':[], 'MACOSX':[]}
groups = {'':[], 'ANDROID':[], 'iOS':[], 'WNT':[], 'LINUX':[], 'MACOSX':[]}
with open(filename, 'r') as f:
lines = f.readlines()
@ -1055,7 +1055,7 @@ class TestMakefileParser(unittest.TestCase):
def test_parse_multiline_eval_with_if(self):
source = """$(eval $(call gb_Library_add_defs,sal,\\
$(if $(filter $(OS),IOS), \\
$(if $(filter $(OS),iOS), \\
-DNO_CHILD_PROCESSES \\
) \\
))
@ -1156,7 +1156,7 @@ endif
self.assertEqual(len(groups['']), 0)
def test_parse_filter(self):
source = """ifneq ($(filter $(OS),MACOSX IOS),)
source = """ifneq ($(filter $(OS),MACOSX iOS),)
$(eval $(call gb_Library_add_exception_objects,sal,\\
sal/osl/unx/osxlocale \\
))

4
bridges/Library_cpp_uno.mk
View file

@ -164,7 +164,7 @@ bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
bridge_asm_objects := call
bridge_noncallexception_noopt_objects := callvirtualmethod
bridge_exception_objects := abi cpp2uno except rtti uno2cpp
else ifneq ($(filter MACOSX IOS,$(OS)),)
else ifneq ($(filter MACOSX iOS,$(OS)),)
bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64
bridge_exception_objects := abi call cpp2uno except uno2cpp
bridge_noncallexception_noopt_objects := callvirtualmethod
@ -206,7 +206,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
$(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \
))
ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX IOS HAIKU,$(OS)),)
ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX iOS HAIKU,$(OS)),)
$(eval $(call gb_Library_add_libs,gcc3_uno,\
-ldl \
))

2
chart2/Module_chart2.mk
View file

@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_l10n_targets,chart2,\
AllLangMoTarget_chart \
))
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
$(eval $(call gb_Module_add_check_targets,chart2,\
CppunitTest_chart2_common_functors \
))

4
configure.ac
View file

@ -4033,7 +4033,7 @@ darwin*)
AC_MSG_ERROR([Can't build 32-bit code for iOS])
;;
arm64)
OS=IOS
OS=iOS
if test "$enable_ios_simulator" = "yes"; then
AC_MSG_ERROR([iOS simulator is only available in OSX not iOS])
else
@ -4047,7 +4047,7 @@ darwin*)
;;
x86_64)
if test "$enable_ios_simulator" = "yes"; then
OS=IOS
OS=iOS
fi
CPUNAME=X86_64
RTL_ARCH=X86_64

2
connectivity/Module_connectivity.mk
View file

@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_dbpool2 \
Library_file \
Library_flat \
$(if $(filter ANDROID IOS,$(OS)),,Library_odbc) \
$(if $(filter ANDROID iOS,$(OS)),,Library_odbc) \
Library_sdbc2 \
Library_writer \
))

2
dbaccess/Module_dbaccess.mk
View file

@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
AllLangMoTarget_dba \
))
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
$(if $(ENABLE_JAVA),CppunitTest_dbaccess_hsqlbinary_import) \

6
desktop/Library_sofficeapp.mk
View file

@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_externals,sofficeapp, \
icu_headers \
icui18n \
icuuc \
$(if $(filter-out IOS,$(OS)), \
$(if $(filter-out iOS,$(OS)), \
curl \
)\
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
endif
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_Library_add_cflags,sofficeapp,\
$(gb_OBJCFLAGS) \
@ -154,7 +154,7 @@ endif
endif
# LibreOfficeKit bits
ifneq ($(filter $(OS),ANDROID IOS MACOSX WNT),)
ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/lib/init \
desktop/source/lib/lokinteractionhandler \

2
desktop/Module_desktop.mk
View file

@ -100,7 +100,7 @@ else ifeq ($(OS),MACOSX)
else ifeq ($(OS),ANDROID)
else ifeq ($(OS),IOS)
else ifeq ($(OS),iOS)
else ifeq ($(OS),HAIKU)

2
extensions/Module_extensions.mk
View file

@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\
AllLangMoTarget_pcr \
))
ifneq ($(filter-out IOS ANDROID,$(OS)),)
ifneq ($(filter-out iOS ANDROID,$(OS)),)
$(eval $(call gb_Module_add_targets,extensions,\
Library_abp \
Library_ldapbe2 \

2
external/Module_external.mk vendored
View file

@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
endif
$(eval $(call gb_Module_add_moduledirs,external,\
$(if $(filter-out IOS,$(OS)),$(call gb_Helper_optional,XMLSEC,xmlsec)) \
$(if $(filter-out iOS,$(OS)),$(call gb_Helper_optional,XMLSEC,xmlsec)) \
$(call gb_Helper_optional,ABW,libabw) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \

12
external/cairo/ExternalProject_cairo.mk vendored
View file

@ -43,9 +43,9 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(call gb_ExternalProject_run,build,\
./configure \
$(if $(debug),STRIP=" ") \
$(if $(filter ANDROID IOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \
$(if $(filter-out ANDROID IOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
$(if $(filter ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)") \
$(if $(filter-out ANDROID iOS,$(OS)),CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" ) \
$(if $(filter ANDROID iOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
LIBS="$(ZLIB_LIBS)" \
pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
@ -54,10 +54,10 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(SYSTEM_FREETYPE),,FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include") \
$(if $(SYSTEM_FONTCONFIG),,FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \
$(if $(filter ANDROID IOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
$(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \
$(if $(filter ANDROID iOS,$(OS)),--disable-xlib --disable-xcb,$(if $(filter TRUE,$(DISABLE_GUI)),--disable-xlib --disable-xcb,--enable-xlib --enable-xcb)) \
$(if $(filter iOS,$(OS)),--enable-quartz --enable-quartz-font) \
--disable-valgrind \
$(if $(filter IOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \
$(if $(filter iOS,$(OS)),--disable-ft,--enable-ft --enable-fc) \
--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
$(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no ax_cv_c_float_words_bigendian=no)) \

4
external/cairo/UnpackedTarball_cairo.mk vendored
View file

@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
external/cairo/cairo/cairo-1.10.2.patch \
))
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
external/cairo/cairo/cairo-1.10.2.no-atsui.patch \
external/cairo/cairo/cairo-1.10.2.ios.patch \
@ -28,7 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
))
endif
ifneq (,$(filter ANDROID IOS,$(OS)))
ifneq (,$(filter ANDROID iOS,$(OS)))
$(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config))
endif

2
external/cppunit/ExternalProject_cppunit.mk vendored
View file

@ -29,7 +29,7 @@ else
cppunit_CXXFLAGS=$(CXXFLAGS)
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL))
cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
endif

2
external/curl/ExternalProject_curl.mk vendored
View file

@ -40,7 +40,7 @@ endif
$(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_ExternalProject_run,build,\
./configure \
$(if $(filter IOS MACOSX,$(OS)),\
$(if $(filter iOS MACOSX,$(OS)),\
--with-darwinssl,\
$(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
--without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls --without-mbedtls \

2
external/epoxy/Library_epoxy.mk vendored
View file

@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_generated_cobjects,epoxy,\
UnpackedTarball/epoxy/src/dispatch_wgl \
UnpackedTarball/epoxy/src/wgl_generated_dispatch \
))
else ifneq ($(filter IOS MACOSX,$(OS)),)
else ifneq ($(filter iOS MACOSX,$(OS)),)
# nothing
else ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_generated_cobjects,epoxy,\

2
external/harfbuzz/ExternalProject_harfbuzz.mk vendored
View file

@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--with-glib=no \
--with-ucdn=no \
--with-graphite2=yes \
$(if $(filter IOS MACOSX,$(OS)),--with-coretext=yes) \
$(if $(filter iOS MACOSX,$(OS)),--with-coretext=yes) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
--libdir=$(call gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \

4
external/hunspell/ExternalProject_hunspell.mk vendored
View file

@ -15,7 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,hunspell,\
hunspell_CPPCLAGS=$(CPPFLAGS)
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL))
hunspell_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif
@ -23,7 +23,7 @@ endif
$(call gb_ExternalProject_get_state_target,hunspell,build):
$(call gb_ExternalProject_run,build,\
$(if $(filter IOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
$(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
LIBS="$(gb_STDLIBS) $(LIBS)" \
autoreconf && \
$(SHELL) ./configure --disable-shared --disable-nls --with-pic \

2
external/hyphen/ExternalProject_hyphen.mk vendored
View file

@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,hyphen,\
$(call gb_ExternalProject_get_state_target,hyphen,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-shared \
$(if $(filter-out IOS,$(OS)),--with-pic) \
$(if $(filter-out iOS,$(OS)),--with-pic) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
&& $(MAKE) \
)

6
external/icu/ExternalProject_icu.mk vendored
View file

@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
else # $(OS)
icu_CFLAGS:=" \
$(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
$(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
$(if $(SYSBASE),-I$(SYSBASE)/usr/include) \
$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(debug),$(gb_DEBUG_CFLAGS)) \
@ -42,7 +42,7 @@ icu_CFLAGS:=" \
$(if $(filter FUZZERS,$(BUILD_TYPE)),-DU_USE_STRTOD_L=0) \
$(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer)"
icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(if $(filter IOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
$(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \
$(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
$(if $(debug),$(gb_DEBUG_CFLAGS)) \
$(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \
@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--disable-layout --disable-samples \
$(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \
$(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
$(if $(filter iOS ANDROID,$(OS)),--disable-dyload) \
$(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\

4
external/libnumbertext/ExternalProject_libnumbertext.mk vendored
View file

@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,libnumbertext,\
libnumbertext_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS_CXX11)
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL))
libnumbertext_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif
@ -29,7 +29,7 @@ libnumbertext_LIBS+=-L$(gb_StaticLibrary_WORKDIR)
$(call gb_ExternalProject_get_state_target,libnumbertext,build):
$(call gb_ExternalProject_run,build,\
$(if $(libnumbertext_LIBS),LIBS='$(libnumbertext_LIBS)') \
$(if $(filter IOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
$(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
autoreconf && \
LIBS="$(gb_STDLIBS) $(LIBS)" \
$(SHELL) ./configure --disable-shared --with-pic \

2
external/liborcus/ExternalProject_liborcus.mk vendored
View file

@ -58,7 +58,7 @@ endif
# library (glibc), the NDK does offer the GNU C++ library as one of
# the C++ libraries available, and we use it.
#
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL))
liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif

2
external/libwps/ExternalProject_libwps.mk vendored
View file

@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwps,\
revenge \
))
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS)))
ifneq (,$(gb_ENABLE_DBGUTIL))
libwps_CPPFLAGS+=-D_GLIBCXX_DEBUG
endif

2
external/libxslt/ExternalProject_libxslt.mk vendored
View file

@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build):
$(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
$(if $(filter iOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,libxml2)) \
&& chmod 777 xslt-config \

2
external/nss/ExternalPackage_nss.mk vendored
View file

@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss))
$(eval $(call gb_ExternalPackage_use_external_project,nss,nss))
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
# nothing...
else ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\

4
external/nss/ExternalProject_nss.mk vendored
View file

@ -33,7 +33,7 @@ else # OS!=WNT
$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
$(if $(filter IOS,$(OS)),\
$(if $(filter iOS,$(OS)),\
$(if $(filter arm64,$(CC)),USE_64=1)) \
$(if $(filter MACOSX,$(OS)),\
$(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \
@ -42,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta
$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
$(if $(CROSS_COMPILING),\
$(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \
$(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
$(MAKE) -j1 AR="$(AR)" \

2
external/nss/UnpackedTarball_nss.mk vendored
View file

@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.patch) \
external/nss/ubsan.patch.0 \
external/nss/clang-cl.patch.0 \
$(if $(filter IOS,$(OS)), \
$(if $(filter iOS,$(OS)), \
external/nss/nss-chromium-nss-static.patch \
external/nss/nss-more-static.patch \
external/nss/nss-ios.patch) \

6
external/openssl/ExternalProject_openssl.mk vendored
View file

@ -38,7 +38,7 @@ OPENSSL_PLATFORM := \
$(if $(filter X86_64,$(CPUNAME)),solaris64-x86_64-cc,solaris-sparcv9-cc)\
)\
,\
$(if $(filter IOS,$(OS)),\
$(if $(filter iOS,$(OS)),\
ios-armv7\
,\
$(if $(filter WNT,$(OS)),\
@ -70,14 +70,14 @@ else
$(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_ExternalProject_run,build,\
unset MAKEFLAGS && \
$(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS IOS,$(OS)), \
$(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS iOS,$(OS)), \
./Configure, \
$(if $(filter WNT,$(OS)), \
$(PERL) Configure, \
./config)) \
$(OPENSSL_PLATFORM) no-dso no-shared \
$(if $(filter-out WNT,$(OS)),no-idea) \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \
$(if $(filter-out ANDROID iOS WNT,$(OS)), \
$(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) build_libs \

2
external/redland/ExternalProject_raptor.mk vendored
View file

@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\
$(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
$(if $(filter iOS,$(OS)),LIBS="-liconv") \
CFLAGS="$(CFLAGS) $(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \
$(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \
LDFLAGS=" \

2
external/xmlsec/ExternalProject_xmlsec.mk vendored
View file

@ -34,7 +34,7 @@ else
$(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(call gb_ExternalProject_run,build,\
$(if $(filter IOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
$(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \
$(if $(filter AIX,$(OS)),ACLOCAL="aclocal -I /opt/freeware/share/aclocal") \
autoreconf \
&& ./configure \

2
i18npool/CustomTarget_breakiterator.mk
View file

@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
$(i18npool_BIDIR)/dict_ja.data $(i18npool_BIDIR)/dict_zh.data $(i18npool_BIDIR)/OpenOffice_dat.c

2
i18npool/Executable_gendict.mk
View file

@ -14,7 +14,7 @@ $(eval $(call gb_Executable_use_libraries,gendict,\
))
ifeq ($(gb_Side),build)
ifneq ($(shell grep OS=IOS $(BUILDDIR)/config_host.mk),)
ifneq ($(shell grep OS=iOS $(BUILDDIR)/config_host.mk),)
$(eval $(call gb_Executable_add_cxxflags,gendict,\
-DDICT_JA_ZH_IN_DATAFILE \
))

2
i18npool/Module_i18npool.mk
View file

@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,i18npool,\
CustomTarget_localedata \
CustomTarget_textconversion \
Library_collator_data \
$(if $(filter-out IOS,$(OS)), \
$(if $(filter-out iOS,$(OS)), \
Library_dict_ja \
Library_dict_zh) \
Library_i18npool \

2
ios/Module_ios.mk
View file

@ -8,7 +8,7 @@
$(eval $(call gb_Module_Module,ios))
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_Module_add_targets,ios,\
StaticLibrary_ios \

2
oox/Library_oox.mk
View file

@ -299,7 +299,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
oox/source/vml/vmltextbox \
))
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
# Either a compiler bug in Xcode 5.1.1 or some hard-to-spot undefined
# behaviour in the source code... Compiling this source file with
# optimization causes some Smart Art images to end up with completely

2
postprocess/Rdb_services.mk
View file

@ -275,7 +275,7 @@ $(eval $(call gb_Rdb_add_components,services,\
reportdesign/util/rptui \
reportdesign/util/rptxml \
shell/source/backends/localebe/localebe1 \
$(if $(filter-out ANDROID IOS,$(OS)),\
$(if $(filter-out ANDROID iOS,$(OS)),\
connectivity/source/drivers/odbc/odbc \
) \
))

4
registry/Module_registry.mk
View file

@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
Library_reg \
$(if $(filter-out $(OS),IOS), \
$(if $(filter-out $(OS),iOS), \
$(if $(ENABLE_MACOSX_SANDBOX),, \
Executable_regmerge \
Executable_regview \
@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,registry,\
) \
))
ifneq ($(OS),IOS) # missing regmerge (see above), needed within test
ifneq ($(OS),iOS) # missing regmerge (see above), needed within test
ifeq ($(ENABLE_MACOSX_SANDBOX),) # ditto

8
sal/Library_sal.mk
View file

@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_defs,sal,\
$(if $(filter FUZZERS,$(BUILD_TYPE)), \
-DFORCE_DEFAULT_SIGNAL \
) \
$(if $(filter IOS,$(OS)), \
$(if $(filter iOS,$(OS)), \
-DNO_CHILD_PROCESSES \
) \
-DSAL_DLLIMPLEMENTATION \
@ -120,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/textenc/unichars \
))
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_Library_add_cxxflags,sal,\
$(gb_OBJCXXFLAGS) \
))
@ -179,7 +179,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/tempfile \
sal/osl/unx/thread \
sal/osl/unx/time \
$(if $(filter-out ANDROID IOS,$(OS)), sal/osl/unx/salinit) \
$(if $(filter-out ANDROID iOS,$(OS)), sal/osl/unx/salinit) \
))
# Note that the uunxapi.mm file just includes the uunxapi.cxx one. Ditto for system.mm
@ -195,7 +195,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
endif
ifneq ($(filter MACOSX IOS,$(OS)),)
ifneq ($(filter MACOSX iOS,$(OS)),)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/osxlocale \
))

2
salhelper/Module_salhelper.mk
View file

@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,salhelper,\
Library_salhelper \
))
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
$(eval $(call gb_Module_add_check_targets,salhelper,\
CppunitTest_salhelper_testapi \
))

4
sc/Module_sc.mk
View file

@ -34,7 +34,7 @@ $(eval $(call gb_Module_add_targets,sc,\
endif
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
$(eval $(call gb_Module_add_check_targets,sc,\
Library_scqahelper \
$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
@ -111,7 +111,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_annotationobj \
CppunitTest_sc_annotationsobj \
CppunitTest_sc_cellrangeobj \
$(if $(filter-out $(OS),IOS), \
$(if $(filter-out $(OS),iOS), \
CppunitTest_sc_databaserangeobj) \
CppunitTest_sc_datapilottableobj \
CppunitTest_sc_datapilotfieldobj \

2
solenv/gbuild/LinkTarget.mk
View file

@ -1330,7 +1330,7 @@ endef
# call gb_LinkTarget__use_linktarget_objects,linktarget,linktargets
define gb_LinkTarget__use_linktarget_objects
$(call gb_LinkTarget_get_target,$(1)) : $(foreach linktarget,$(2),$(call gb_LinkTarget_get_target,$(linktarget)))
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS += $(foreach linktarget,$(2),$(call gb_LinkTarget_get_objects_list,$(linktarget)))
endif

13
solenv/gbuild/gbuild.mk
View file

@ -167,18 +167,7 @@ gb_Library_DLLPOSTFIX := lo
# Include platform/cpu/compiler specific config/definitions
# Work around inconsistency in case of $(OS) being "IOS" (all
# upper-case) vs. the file being included here having the name
# iOS_*_*.mk (lower-case 'i'). This went unnoticed until now when I
# happen to build for iOS on a case-sensitive file system.
ifeq ($(OS),IOS)
gbuildplatformosname=iOS
else
gbuildplatformosname=$(OS)
endif
include $(GBUILDDIR)/platform/$(gbuildplatformosname)_$(CPUNAME)_$(COM).mk
include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
# this is optional
include $(SRCDIR)/RepositoryFixes.mk

2
solenv/gbuild/platform/iOS.mk
View file

@ -35,7 +35,7 @@ gb_DEBUGINFO_FLAGS=-g
gb_MKTEMP := /usr/bin/mktemp -t gbuild.
gb_OSDEFS := \
-D$(OS) \
-DIOS \
-D_PTHREADS \
-DUNIX \
-DUNX \

2
sw/Module_sw.mk
View file

@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sw,\
UIConfig_swxform \
))
ifneq ($(OS),IOS)
ifneq ($(OS),iOS)
$(eval $(call gb_Module_add_l10n_targets,sw,\
AllLangMoTarget_sw \
))

2
toolkit/Library_tk.mk
View file

@ -130,7 +130,7 @@ $(eval $(call gb_Library_add_libs,tk,\
))
endif
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_Library_add_cxxflags,tk,\
$(gb_OBJCXXFLAGS)))
endif

6
vcl/Library_vcl.mk
View file

@ -27,7 +27,7 @@ else ifeq ($(OS),WNT)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
else ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.android))
else ifeq ($(OS),IOS)
else ifeq ($(OS),iOS)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.ios))
else ifeq ($(DISABLE_GUI),TRUE)
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.headless))
@ -441,7 +441,7 @@ vcl_coretext_code= \
vcl_headless_code= \
vcl/headless/svpframe \
$(if $(filter-out IOS,$(OS)), \
$(if $(filter-out iOS,$(OS)), \
vcl/headless/svpbmp \
vcl/headless/svpgdi \
vcl/headless/svpdata) \
@ -604,7 +604,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
endif
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_Library_add_cxxflags,vcl,\
$(gb_OBJCXXFLAGS) \
))

2
vcl/Module_vcl.mk
View file

@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
ifeq ($(CROSS_COMPILING)$(DISABLE_DYNLOADING),)
$(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter-out ANDROID IOS WNT,$(OS)), \
$(if $(filter-out ANDROID iOS WNT,$(OS)), \
Executable_svdemo \
Executable_fftester \
Executable_svptest \

2
vcl/StaticLibrary_vclmain.mk
View file

@ -19,7 +19,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
ifeq ($(OS),IOS)
ifeq ($(OS),iOS)
$(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\
$(gb_OBJCXXFLAGS) \
))