Fixed focal glibc build issues for ubuntu and windows

Change-Id: I01c0787973d3e25544a7f793b5ea819dbfa5d5ec
Signed-off-by: varinder.p <varinder.p@samsung.com>

diff --git a/hw/9pfs/9p-maru.c b/hw/9pfs/9p-maru.c
index 20d0d07a46fc75c5741fedeaf184d62c05e6fbe5..fb3502ee737234fe3dcfcf38222584e7c62f004d 100644 (file)
--- a/hw/9pfs/9p-maru.c
+++ b/hw/9pfs/9p-maru.c
@@ -54,6 +54,8 @@
 #define WIN32_D_TYPE 0
 
 extern uint64_t hostBytesPerSector;
+#elif CONFIG_LINUX
+#include <sys/sysmacros.h>
 #endif
 
 #ifdef CONFIG_DARWIN

diff --git a/package/build.linux b/package/build.linux
index 5c47441e3be3a919865f5fe41a1809aaa132be69..095c992ab5d2d0a3393d73d54a5345e3b11d0ad4 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -34,7 +34,7 @@ prepare()
        else
                # for linux target
 
-               REQUIRED_PKG="ant python zlib1g-dev libglib2.0-dev libsdl1.2-dev \
+               REQUIRED_PKG="ant python3 zlib1g-dev libglib2.0-dev libsdl1.2-dev \
                        libasound2-dev libx11-dev libv4l-dev libxcomposite-dev \
                        libpixman-1-dev libcurl4-gnutls-dev     libcap-dev libattr1-dev"
 

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index ea37c097cf2bcef50808a15d971dc384e5e5f820..be766c5405eb72719a57a5a6a7e00577367a4e90 100644 (file)
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -40,6 +40,7 @@ extern char **environ;
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <sys/sysmacros.h>
 
 #ifdef FIFREEZE
 #define CONFIG_FSFREEZE

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index b5d675e7f7c85288215b8cd0229d78bb2543431e..107ac237e5573755478fd0ba4d3d3137d449a8e8 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -113,17 +113,21 @@ echo "$*"
 
 # avoid pkg-config bug on Windows
 if [ -z ${PKG_CONFIG_PATH} ] ; then
-export PKG_CONFIG_LIBDIR=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig
 export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig
 else
-export PKG_CONFIG_LIBDIR=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig:${PKG_CONFIG_LIBDIR}
 export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}
 fi
 
+if [ -z ${PKG_CONFIG_LIBDIR} ] ; then
+    if [ ! -z "$CROSS_PREFIX" ] ; then
+        export PKG_CONFIG_LIBDIR=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig
+    fi 
+fi
+
 # append common options
 CONFIGURE_APPEND="
  --target-list=$EMUL_TARGET_LIST
- --enable-werror
+ --disable-werror
  --enable-maru
  --enable-yagl
  --enable-vigs

diff --git a/util/memfd.c b/util/memfd.c
index 4571d1aba866a67de41721aa17e4f54e0df695ef..d9c1657c8373deede83a2db5a3539165469a46a2 100644 (file)
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -37,7 +37,7 @@
 #include <sys/syscall.h>
 #include <asm/unistd.h>
 
-static int memfd_create(const char *name, unsigned int flags)
+int memfd_create(const char *name, unsigned int flags)
 {
 #ifdef __NR_memfd_create
     return syscall(__NR_memfd_create, name, flags);