Merge pull request #127 from kiwix/compilation_fixes

Compilation fixes

meson.build

@@ -15,22 +15,14 @@ kiwixlib_dep = dependency('kiwix', version:'>=1.0.0', static:static_linkage)
 microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
 z_dep = dependency('zlib', static:static_linkage)
 
-# This is a temporary workaround until xapian fix it's xapian-core.pc
-# For a correct dependency checking we should test if uuid is really installed
-# but for a workaround, we assume that in xapian is installed, uuid also.
-if meson.is_cross_build() and host_machine.system() == 'windows'
-    # xapian doesn't use uuid on windows.
-    uuid_dep = declare_dependency()
-else
-    xapian_dep = dependency('xapian-core', required : false)
-    if xapian_dep.found()
-        uuid_dep = declare_dependency(link_args:['-luuid', '-lrt'])
-    else
-        uuid_dep = declare_dependency()
-    endif
-endif
+all_deps = [thread_dep, kiwixlib_dep, microhttpd_dep, z_dep]
 
-all_deps = [thread_dep, kiwixlib_dep, microhttpd_dep, z_dep, uuid_dep]
+if static_linkage
+  librt = compiler.find_library('rt', required:false)
+  if librt.found()
+    all_deps += librt
+  endif
+endif
 
 #subdir('include')
 subdir('static')

travis/compile.sh

@@ -8,24 +8,17 @@ INSTALL_DIR=${BUILD_DIR}/INSTALL
 
 case ${PLATFORM} in
     "native_static")
-         MESON_OPTION="--default-library=static"
+         MESON_OPTION="-Dstatic-linkage=true"
          ;;
     "native_dyn")
-         MESON_OPTION="--default-library=shared"
+         MESON_OPTION=""
          ;;
     "win32_static")
-         MESON_OPTION="--default-library=static --cross-file ${BUILD_DIR}/meson_cross_file.txt"
+         MESON_OPTION="-Dstatic-linkage=true --cross-file ${BUILD_DIR}/meson_cross_file.txt"
          ;;
     "win32_dyn")
-         MESON_OPTION="--default-library=shared --cross-file ${BUILD_DIR}/meson_cross_file.txt"
+         MESON_OPTION="--cross-file ${BUILD_DIR}/meson_cross_file.txt"
          ;;
-    "android_arm")
-         MESON_OPTION="-Dandroid=true --default-library=shared --cross-file ${BUILD_DIR}/meson_cross_file.txt"
-         ;;
-    "android_arm64")
-         MESON_OPTION="-Dandroid=true --default-library=shared --cross-file ${BUILD_DIR}/meson_cross_file.txt"
-         ;;
-
 esac
 
 cd ${TRAVIS_BUILD_DIR}

travis/install_deps.sh

@@ -29,7 +29,7 @@ esac
 
 sudo apt-get update -qq
 sudo apt-get install -qq python3-pip ${PACKAGES}
-sudo pip3 install meson
+sudo pip3 install meson==0.43.0
 
 # Ninja
 cd $HOME