RepositoryExternal.mk | 10 ++++++--- configure.ac | 27 +++++++------------------ external/firebird/ExternalProject_firebird.mk | 7 ------ external/libatomic_ops/Module_libatomic_ops.mk | 4 --- 4 files changed, 16 insertions(+), 32 deletions(-)
New commits: commit 31fd531b2757269dde108b362752f7949615736a Author: Andrzej J.R. Hunt <[email protected]> Date: Wed Nov 6 19:41:30 2013 +0000 Revert "Make libatomic_ops buildable and enable on non-X86." (Pushed from wrong branch -- incomplete/broken.) This reverts commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6. diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0f557a7..32711b4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -703,10 +703,15 @@ $(LIBATOMIC_OPS_CFLAGS) \ $(call gb_LinkTarget_use_external_project,$(1),\ libatomic_ops \ ) - +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \ +) +else $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib -latomic_ops \ + -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs -latomic_ops-7.2d \ ) +endif endef @@ -3153,7 +3158,6 @@ $(call gb_ExternalExecutable_set_external,python,$(call gb_UnpackedTarball_get_d # target, as that is not used on Mac) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_get_target_for_build,python3)) -<<<<<<< HEAD else $(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) diff --git a/configure.ac b/configure.ac index 13751e9..b73df30 100644 --- a/configure.ac +++ b/configure.ac @@ -8511,22 +8511,14 @@ if test "x$enable_firebird_sdbc" = "xyes"; then elif test "$cross_compiling" = "yes"; then AC_MSG_RESULT([none]) else - dnl We need libatomic-ops for any non X86/X64 system - if test "$CPU" != I -a "$CPU" != X; then - dnl =================================================================== - dnl Check for system libatomic-ops - dnl =================================================================== - libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2]) - if test "$with_system_libatomic_ops" = "yes"; then - SYSTEM_LIBATOMIC_OPS=YES - AC_CHECK_HEADERS(atomic_ops.h, [], - [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], []) - else - SYSTEM_LIBATOMIC_OPS=NO - LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include" - LIBATOMIC_OPS_LIBS="-latomic_ops" - BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS" - fi + dnl =================================================================== + dnl Check for system libatomic-ops + dnl =================================================================== + libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2]) + if test "$with_system_libatomic_ops" = "yes"; then + SYSTEM_LIBATOMIC_OPS=YES + AC_CHECK_HEADERS(atomic_ops.h, [], + [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], []) fi AC_MSG_RESULT([internal]) @@ -8540,9 +8532,6 @@ if test "x$enable_firebird_sdbc" = "xyes"; then fi AC_SUBST(ENABLE_FIREBIRD_SDBC) -AC_SUBST(SYSTEM_LIBATOMIC_OPS) -AC_SUBST(LIBATOMIC_OPS_CFLAGS) -AC_SUBST(LIBATOMIC_OPS_LIBS) AC_SUBST(SYSTEM_FIREBIRD) AC_SUBST(FIREBIRD_CFLAGS) AC_SUBST(FIREBIRD_LIBS) diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 871286f..b87b4d3 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -29,12 +29,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS \ && export PKG_CONFIG="" \ - && export CPPFLAGS=" \ - $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \ - -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ - ,$(LIBATOMIC_OPS_CFLAGS)) \ - " \ - && export CFLAGS=" \ + && export CXXFLAGS=" \ $(if $(filter NO,$(SYSTEM_BOOST)), \ -I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS) \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib) \ diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index 0a9a534..7dca670 100644 --- a/external/libatomic_ops/Module_libatomic_ops.mk +++ b/external/libatomic_ops/Module_libatomic_ops.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libatomic_ops)) -ifeq ($(SYSTEM_LIBATOMIC_OPS),NO) - $(eval $(call gb_Module_add_targets,libatomic_ops,\ ExternalProject_libatomic_ops \ UnpackedTarball_libatomic_ops \ )) -endif - # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
