[Libreoffice-commits] core.git: desktop/Executable_unopkg_com.mk external/clucene registry/Library_reg.mk sal/Library_sal.mk sal/Library_sal_textenc.mk sal/Library_uwinapi.mk sal/StaticLibrary_salcpprt.mk solenv/gbuild store/Library_store.mk
Michael Stahl
mstahl at redhat.com
Fri Oct 7 13:03:56 UTC 2016
desktop/Executable_unopkg_com.mk | 4 ----
external/clucene/Library_clucene.mk | 1 -
registry/Library_reg.mk | 1 -
sal/Library_sal.mk | 1 -
sal/Library_sal_textenc.mk | 4 ----
sal/Library_uwinapi.mk | 1 -
sal/StaticLibrary_salcpprt.mk | 4 ----
solenv/gbuild/platform/IOS_ARM_GCC.mk | 3 ++-
solenv/gbuild/platform/macosx.mk | 3 ++-
solenv/gbuild/platform/solaris.mk | 1 +
solenv/gbuild/platform/unxgcc.mk | 1 +
solenv/gbuild/platform/windows.mk | 1 +
store/Library_store.mk | 1 -
13 files changed, 7 insertions(+), 19 deletions(-)
New commits:
commit 62b75cd1698474b9232b46777e418de4786a3132
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Oct 7 14:12:01 2016 +0200
tdf#100302: gbuild: always use $(LFS_CFLAGS)
Currently LFS_CFLAGS are only used in a handful of libraries but there's
no obvious reason why it can't just be set everywhere.
Also set it in windows.mk, i have no idea if it's needed for MinGW
(certainly not for MSVC).
Change-Id: I5f62e3011c2089abbf5539fc54c7ff10e07b1599
diff --git a/desktop/Executable_unopkg_com.mk b/desktop/Executable_unopkg_com.mk
index 2c46d2c..4db7d96 100644
--- a/desktop/Executable_unopkg_com.mk
+++ b/desktop/Executable_unopkg_com.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com))
$(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
-$(eval $(call gb_Executable_add_defs,unopkg_com,\
- $(LFS_CFLAGS) \
-))
-
$(eval $(call gb_Executable_add_exception_objects,unopkg_com,\
desktop/win32/source/guistdio/unopkgio \
))
diff --git a/external/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk
index 7ac8a48..763bcd7 100644
--- a/external/clucene/Library_clucene.mk
+++ b/external/clucene/Library_clucene.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_add_defs,clucene,\
-Dclucene_shared_EXPORTS \
-Dclucene_core_EXPORTS \
-Dclucene_contribs_lib_EXPORTS \
- $(LFS_CFLAGS) \
))
# clucene is riddled with warnings... let's spare use
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 7994d02..d765a26 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_Library_Library,reg))
$(eval $(call gb_Library_add_defs,reg,\
- $(LFS_CFLAGS) \
-DREG_DLLIMPLEMENTATION \
))
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 80e8124..868dea4 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,sal,\
$(if $(filter $(OS),IOS), \
-DNO_CHILD_PROCESSES \
) \
- $(LFS_CFLAGS) \
-DSAL_DLLIMPLEMENTATION \
-DRTL_OS="\"$(RTL_OS)\"" \
-DRTL_ARCH="\"$(RTL_ARCH)\"" \
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
index e92ddb0..331b465 100644
--- a/sal/Library_sal_textenc.mk
+++ b/sal/Library_sal_textenc.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_defs,sal_textenc,\
- $(LFS_CFLAGS) \
-))
-
$(eval $(call gb_Library_add_exception_objects,sal_textenc,\
sal/textenc/context \
sal/textenc/convertbig5hkscs \
diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index ed4efde..e9a00ab 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\
$(eval $(call gb_Library_add_defs,uwinapi,\
$(if $(filter $(COM),GCC), \
-Wno-unused-parameter -Wno-return-type) \
- $(LFS_CFLAGS) \
))
$(eval $(call gb_Library_add_cobjects,uwinapi,\
diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index dbcf484..9127a8a 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -10,10 +10,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
-$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
- $(LFS_CFLAGS) \
-))
-
$(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \
))
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 388cc5d..e219246 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -39,7 +39,8 @@ gb_OSDEFS := \
-DUNIX \
-DUNX \
-D_REENTRANT \
- -DNO_PTHREAD_PRIORITY
+ -DNO_PTHREAD_PRIORITY \
+ $(LFS_CFLAGS) \
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 01adafbd..9bf18c3 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -38,7 +38,8 @@ gb_OSDEFS := \
-DNO_PTHREAD_PRIORITY \
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
- -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
+ -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
+ $(LFS_CFLAGS) \
gb_CFLAGS := \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 1e9a1f3..de98363 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -36,6 +36,7 @@ gb_OSDEFS := \
-DUNIX \
-DUNX \
$(PTHREAD_CFLAGS) \
+ $(LFS_CFLAGS) \
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d6b9fcfe..a51db16 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -34,6 +34,7 @@ gb_OSDEFS := \
-DUNIX \
-DUNX \
$(PTHREAD_CFLAGS) \
+ $(LFS_CFLAGS) \
gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index ebd2a3c..9c73a50 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -34,6 +34,7 @@ gb_OSDEFS := \
-DWIN32 \
-DWNT \
-DNOMINMAX \
+ $(LFS_CFLAGS) \
gb_UWINAPI :=
diff --git a/store/Library_store.mk b/store/Library_store.mk
index d5b02c0..ab0d025 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,store))
$(eval $(call gb_Library_use_external,store,boost_headers))
$(eval $(call gb_Library_add_defs,store,\
- $(LFS_CFLAGS) \
-DSTORE_DLLIMPLEMENTATION \
))
More information about the Libreoffice-commits
mailing list