diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-07-03 13:46:38 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-07-03 13:49:20 +0200 |
| commit | 025952f52767fb3508a6725468fe4b1e6ce4c9b1 (patch) | |
| tree | a759ba29c5f60ab221f6fe03e752f9bfef3cc613 /onlineupdate | |
| parent | 7eb863d6b6258f31343d4b0b82038afe5e036bc0 (diff) | |
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
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 16 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index 30713c486556..a4c4f9563108 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -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) \ )) diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 8de9cc1e0898..998a3109bf3f 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -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) |