From: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Date: Wed, 24 Sep 2014 15:25:16 +0000 (+0200)
Subject: meta-tizen: Fix issues when building against upstream Poky
X-Git-Tag: rev_ivi_2015_02_04~236
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9106c6c80cb031f70e4f8f3454d25a7665e2406;p=scm%2Fbb%2Ftizen-distro.git

meta-tizen: Fix issues when building against upstream Poky

* Add "inherit pkgconfig" where necessary.
* Fix configure errors: "error: required file './ABOUT-NLS' not found".
* Add ':' to FILESEXTRAPATHS.

Change-Id: I07be3e410af6c5f723b56089e1ac894b0d9652d0
(From meta-tizen rev: 772470502aebd90fc7f0d8f3a2bc4b0154385a92)

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
---

diff --git a/meta-tizen/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend b/meta-tizen/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend
index 017b273..9258eb3 100644
--- a/meta-tizen/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend
+++ b/meta-tizen/recipes-multimedia/pulseaudio/pulseaudio_5.0.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/pulseaudio_5.0"
+FILESEXTRAPATHS_prepend := "${THISDIR}/pulseaudio_5.0:"
 
 SRC_URI += "file://change_libsystemd_to_libsystemd-login_in_configure.patch"
 #SRC_URI += "file://changes-to-pa-simple-api-samsung.patch"
@@ -107,4 +107,4 @@ SRC_URI += "file://0099-sink-input-source-output-Assign-to-reference_ratio-f.pat
 SRC_URI += "file://0100-sink-input-source-output-Add-hooks-for-reference-rat.patch"
 SRC_URI += "file://0101-sink-input-source-output-Use-new_data.volume-only-fo.patch"
 SRC_URI += "file://0102-sink-input-source-output-Add-the-real-object-pointer.patch"
-SRC_URI += "file://0103-audio-groups-main-volume-policy-volume-api-Various-f.patch"
\ No newline at end of file
+SRC_URI += "file://0103-audio-groups-main-volume-policy-volume-api-Various-f.patch"
diff --git a/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc b/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc
index a4b163a..dfd2f55 100644
--- a/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc
+++ b/meta-tizen/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc
@@ -1,29 +1,33 @@
+inherit pkgconfig
+
 do_compile() {
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
+    cd ${S}
+    LANG=C
+    export LANG
+    unset DISPLAY
+    LD_AS_NEEDED=1; export LD_AS_NEEDED ;
 
- cp -f ${PKG_CONFIG_SYSROOT_DIR}${datadir}/libtool/config/config.guess ${WORKDIR}
- cp -f ${PKG_CONFIG_SYSROOT_DIR}${datadir}/libtool/config/config.sub ${WORKDIR}
+    cp -f ${PKG_CONFIG_SYSROOT_DIR}${datadir}/libtool/config/config.guess ${WORKDIR}
+    cp -f ${PKG_CONFIG_SYSROOT_DIR}${datadir}/libtool/config/config.sub ${WORKDIR}
 
-   autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
-         --target=x86_64-tizen-linux \
-         --program-prefix= \
-         --prefix=${prefix} \
-         --exec-prefix=${prefix} \
-         --bindir=${prefix}/bin \
-         --sbindir=${prefix}/sbin \
-         --sysconfdir=${sysconfdir} \
-         --datadir=${prefix}/share \
-         --includedir=${prefix}/include \
-         --libdir=${prefix}/lib \
-         --libexecdir=${prefix}/libexec \
-         --localstatedir=${localstatedir} \
-         --sharedstatedir=${prefix}/com \
-         --mandir=${mandir} \
-         --infodir=${infodir} --disable-static
- make -j16
+    autotools_do_configure \
+        --build=${TARGET_SYS} \
+        --host=${HOST_SYS} \
+        --target=x86_64-tizen-linux \
+        --program-prefix= \
+        --prefix=${prefix} \
+        --exec-prefix=${prefix} \
+        --bindir=${prefix}/bin \
+        --sbindir=${prefix}/sbin \
+        --sysconfdir=${sysconfdir} \
+        --datadir=${prefix}/share \
+        --includedir=${prefix}/include \
+        --libdir=${prefix}/lib \
+        --libexecdir=${prefix}/libexec \
+        --localstatedir=${localstatedir} \
+        --sharedstatedir=${prefix}/com \
+        --mandir=${mandir} \
+        --infodir=${infodir} --disable-static
 
+    make -j16
 }
diff --git a/meta-tizen/recipes-tizen/avsystem/avsystem-extraconf.inc b/meta-tizen/recipes-tizen/avsystem/avsystem-extraconf.inc
index e132164..7586638 100644
--- a/meta-tizen/recipes-tizen/avsystem/avsystem-extraconf.inc
+++ b/meta-tizen/recipes-tizen/avsystem/avsystem-extraconf.inc
@@ -1,18 +1,18 @@
 SRC_URI += "file://add-subdir-objects-option.patch"
 SRC_URI += "file://add-PA_PROP_MEDIA_POLICY-Define.patch"
 
+inherit pkgconfig
+
 avsystem-dbg_files += "${prefix}/local/bin/.debug"
 avsystem-dbg_files += "${prefix}/local/bin/.debug/*"
 avsystem-dbg_files += "${prefix}/lib/.debug/*.so.*"
 
-
 avsystem-dev_files = ""
 avsystem-dev_files += "avsystem.manifest"
 avsystem-dev_files += "${prefix}/lib/pkgconfig/*.pc"
 avsystem-dev_files += "${prefix}/lib/*.so"
 avsystem-dev_files += "${prefix}/include/avsystem/*.h"
 
-
 libavsysaudio_files = ""
 libavsysaudio_files += "avsystem.manifest"
 libavsysaudio_files += "${prefix}/lib/lib*.so.*"
diff --git a/meta-tizen/recipes-tizen/edbus/edbus-extraconf.inc b/meta-tizen/recipes-tizen/edbus/edbus-extraconf.inc
index e69de29..15d8a02 100644
--- a/meta-tizen/recipes-tizen/edbus/edbus-extraconf.inc
+++ b/meta-tizen/recipes-tizen/edbus/edbus-extraconf.inc
@@ -0,0 +1,2 @@
+inherit pkgconfig
+
diff --git a/meta-tizen/recipes-tizen/efl/efl-extraconf.inc b/meta-tizen/recipes-tizen/efl/efl-extraconf.inc
index 3d65286..3d70eb2 100644
--- a/meta-tizen/recipes-tizen/efl/efl-extraconf.inc
+++ b/meta-tizen/recipes-tizen/efl/efl-extraconf.inc
@@ -1,3 +1,5 @@
+inherit pkgconfig
+
 INSANE_SKIP_${PN} = "dev-so"
 
 EXTRA_OECONF += " \
@@ -39,6 +41,11 @@ DEPENDS_class-native = " zlib-native tiff-native openssl-native curl-native font
 
 DEPENDS_append_class-target = " efl-native "
 
+do_configure_prepend() {
+    # Fix configure error: "error: required file './ABOUT-NLS' not found"
+    sed -i 's/AM_INIT_AUTOMAKE(\[1.6 dist-bzip2 -Wall color-tests\])/AM_INIT_AUTOMAKE(\[1.6 dist-bzip2 -Wall color-tests foreign\])/' configure.ac
+}
+
 # new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need
 do_configure_prepend_class-native() {
     sed -i 's/EFL_LIB_START_OPTIONAL(\[Eeze\], \[test "${have_linux}" = "yes"\])/EFL_LIB_START_OPTIONAL([Eeze], [test "${no-we-really-dont-want-native-eeze}" = "yes"])/g' ${S}/configure.ac
diff --git a/meta-tizen/recipes-tizen/elementary/elementary-extraconf.inc b/meta-tizen/recipes-tizen/elementary/elementary-extraconf.inc
index f124de5..e5a1ad5 100644
--- a/meta-tizen/recipes-tizen/elementary/elementary-extraconf.inc
+++ b/meta-tizen/recipes-tizen/elementary/elementary-extraconf.inc
@@ -1,6 +1,10 @@
+inherit pkgconfig
+
 SRC_URI += "file://Fix_build.patch"
 
 do_configure_prepend() {
+    # Fix configure error: "error: required file './ABOUT-NLS' not found"
+    sed -i 's/AM_INIT_AUTOMAKE(\[1.6 dist-bzip2\])/AM_INIT_AUTOMAKE(\[1.6 dist-bzip2 foreign\])/' configure.ac
     # prefix returned eolian paths with STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
     sed -i "s^DEPS_EOLIAN_FLAGS=\`pkg-config --variable=eolian_flags eo evas edje ecore\`$^DEPS_EOLIAN_FLAGS=\`\$PKG_CONFIG --variable=eolian_flags eo evas edje ecore | sed 's#-I${prefix}#-I${STAGING_DIR_HOST}${prefix}#g'\`^g" ${S}/configure.ac
 }
@@ -33,4 +37,4 @@ FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/datetime_input_ctxpopup/v-1
 FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/test_entry/v-1.9.3/.debug"
 FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/access_output/v-1.9.3/.debug"
 FILES_${PN}-dbg += "${prefix}/lib/elementary/modules/test_map/v-1.9.3/.debug"
-FILES_${PN}-dbg += "${prefix}/lib/edje/modules/elm/v-1.9/.debug"
\ No newline at end of file
+FILES_${PN}-dbg += "${prefix}/lib/edje/modules/elm/v-1.9/.debug"
diff --git a/meta-tizen/recipes-tizen/ibus/ibus-extraconf.inc b/meta-tizen/recipes-tizen/ibus/ibus-extraconf.inc
index b598a7c..adc0055 100644
--- a/meta-tizen/recipes-tizen/ibus/ibus-extraconf.inc
+++ b/meta-tizen/recipes-tizen/ibus/ibus-extraconf.inc
@@ -1,7 +1,10 @@
-EXTRA_OECONF += " --disable-introspection "
+inherit pkgconfig
+
+SRC_URI += " file://Remove_vala_test.patch "
 
 DEPENDS_append_class-target = " vala-native "
 
-SRC_URI += " file://Remove_vala_test.patch "
+EXTRA_OECONF += " --disable-introspection "
+
+FILES_${PN} += "/usr/lib/ibus/ibus-wayland"
 
-FILES_${PN} += "/usr/lib/ibus/ibus-wayland"
\ No newline at end of file
diff --git a/meta-tizen/recipes-tizen/libhangul/libhangul-extraconf.inc b/meta-tizen/recipes-tizen/libhangul/libhangul-extraconf.inc
index e69de29..6128d08 100644
--- a/meta-tizen/recipes-tizen/libhangul/libhangul-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libhangul/libhangul-extraconf.inc
@@ -0,0 +1,6 @@
+inherit pkgconfig
+
+do_configure_prepend() {
+    # Fix configure error: "error: required file './ABOUT-NLS' not found"
+    sed -i 's/^AM_INIT_AUTOMAKE$/AM_INIT_AUTOMAKE(\[foreign\])/' configure.ac
+}
diff --git a/meta-tizen/recipes-tizen/libmm-common/libmm-common-extraconf.inc b/meta-tizen/recipes-tizen/libmm-common/libmm-common-extraconf.inc
index 8b13789..15d8a02 100644
--- a/meta-tizen/recipes-tizen/libmm-common/libmm-common-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libmm-common/libmm-common-extraconf.inc
@@ -1 +1,2 @@
+inherit pkgconfig
 
diff --git a/meta-tizen/recipes-tizen/libmm-log/libmm-log-extraconf.inc b/meta-tizen/recipes-tizen/libmm-log/libmm-log-extraconf.inc
index e69de29..d0ee75a 100644
--- a/meta-tizen/recipes-tizen/libmm-log/libmm-log-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libmm-log/libmm-log-extraconf.inc
@@ -0,0 +1 @@
+inherit pkgconfig
diff --git a/meta-tizen/recipes-tizen/libnet-client/libnet-client-extraconf.inc b/meta-tizen/recipes-tizen/libnet-client/libnet-client-extraconf.inc
index c6493949..7dc13cc 100644
--- a/meta-tizen/recipes-tizen/libnet-client/libnet-client-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libnet-client/libnet-client-extraconf.inc
@@ -26,31 +26,29 @@ do_install() {
 
 
 INSANE_SKIP_${PN} = "dev-so"
-do_install() {
- echo export RPM_BUILD_ROOT=${D}
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- rm -rf ${D}
- mkdir -p ${D}
-
-
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install
-   rm -f ${D}${infodir}/dir
-   find ${D} -regex ".*\.la$" | xargs rm -f --
-   find ${D} -regex ".*\.a$" | xargs rm -f --
-
- #License
- mkdir -p ${D}${prefix}/share/license
- cp LICENSE.Flora ${D}${prefix}/share/license/libnet-client
+inherit pkgconfig
 
+INSANE_SKIP_${PN} = "dev-so"
 
+do_install() {
+    echo export RPM_BUILD_ROOT=${D}
+    cd ${S}
+    LANG=C
+    export LANG
+    unset DISPLAY
+    rm -rf ${D}
+    mkdir -p ${D}
+
+    oe_runmake \
+        DESTDIR=${D} \
+        INSTALL_ROOT=${D} \
+        BINDIR=${prefix}/bin \
+    install
+    rm -f ${D}${infodir}/dir
+    find ${D} -regex ".*\.la$" | xargs rm -f --
+    find ${D} -regex ".*\.a$" | xargs rm -f --
+
+    #License
+    mkdir -p ${D}${prefix}/share/license
+    cp LICENSE.Flora ${D}${prefix}/share/license/libnet-client
 }
-
-
-INSANE_SKIP_${PN} = "dev-so"
\ No newline at end of file
diff --git a/meta-tizen/recipes-tizen/libpinyin/libpinyin-extraconf.inc b/meta-tizen/recipes-tizen/libpinyin/libpinyin-extraconf.inc
index c50cc6a..9b9c23a 100644
--- a/meta-tizen/recipes-tizen/libpinyin/libpinyin-extraconf.inc
+++ b/meta-tizen/recipes-tizen/libpinyin/libpinyin-extraconf.inc
@@ -1,3 +1,5 @@
+inherit pkgconfig
+
 DEPENDS_append_class-target += "libpinyin-native"
 
 EXTRA_OEMAKE_class-target += " utils_storage=${STAGING_BINDIR_NATIVE}"
@@ -13,3 +15,4 @@ do_compile() {
     autotools_do_configure
     oe_runmake -j16
 }
+
diff --git a/meta-tizen/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc b/meta-tizen/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc
index 305e664..40ac5ce 100644
--- a/meta-tizen/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc
+++ b/meta-tizen/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc
@@ -1 +1,4 @@
+inherit pkgconfig
+
 EXTRA_OECONF += " --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc "
+