Kaydet (Commit) 025952f5 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

online update: Make the 'updater' build & link at least on Linux.

Works with the non-system bzip2; the --with-system case might still need some
love - but then again, distros want to have the online update switched off
anyway...

Change-Id: I26a27aec07a8f1aac22a4d14a38fb5b833550ea7
üst 7eb863d6
......@@ -4131,16 +4131,19 @@ $(call gb_LinkTarget_set_include,$(1),\
$(call gb_LinkTarget_add_libs,$(1),$(BZIP2_LIBS))
endef
gb_ExternalProject__use_bzip2 :=
else # !SYSTEM_BZIP2
define gb_LinkTarget__use_bzip2
$(call gb_LinkTarget_use_external_project,$(1),bzip2)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,bzip2) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,bzip2) -lbz2 \
)
endef
define gb_ExternalProject__use_bzip2
......
......@@ -26,22 +26,6 @@ $(eval $(call gb_Executable_add_libs,updater,\
-lICE \
))
ifeq ($(OS),MACOSX)
$(eval $(call gb_Executable_set_include,updater,\
-lgtk \
))
$(eval $(call gb_Exectuable_add_libs,updater,\
-lpthread \
))
else ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_set_include,updater,\
-lgtk \
))
$(eval $(call gb_Exectuable_add_libs,updater,\
-lpthread \
))
endif
$(eval $(call gb_Executable_add_cxxflags,updater,\
$$(GTK3_CFLAGS) \
))
......
......@@ -143,7 +143,7 @@ static bool sUseHardLinks = true;
// declare it here to avoid including that entire header file.
#define BZ2_CRC32TABLE_UNDECLARED
#if MOZ_IS_GCC
#if defined(HAVE_GCC_VISIBILITY_FEATURE)
extern "C" __attribute__((visibility("default"))) unsigned int BZ2_crc32Table[256];
#undef BZ2_CRC32TABLE_UNDECLARED
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment