From: Ronan Le Martret <ronan@fridu.net>
Date: Wed, 10 Apr 2013 13:39:31 +0000 (+0200)
Subject: - solve python, dlog.
X-Git-Tag: rev_0.4~373
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8245803da82ba251c55f2907fafd85223d595186;p=scm%2Fbb%2Ftizen.git

- solve python, dlog.
---

diff --git a/Tizen_TZ_package/spec2yocto.py b/Tizen_TZ_package/spec2yocto.py
index 822e3fb..c2dc8e9 100755
--- a/Tizen_TZ_package/spec2yocto.py
+++ b/Tizen_TZ_package/spec2yocto.py
@@ -268,7 +268,7 @@ class specParser:
         if pkgName in [ "glibc"]:
             command += " --define='_sbindir /usr/sbin'"
             
-        if pkgName in ["freetype","popt","pcre","which","findutils","tizen-coreutils","python","ncurses"]:
+        if pkgName in ["freetype","popt","pcre","which","findutils","tizen-coreutils","python","ncurses","dlog"]:
             oe_runconf2='''oe_runconf2'''        
             command += " --define='%%_configure %s'" % oe_runconf2
             
@@ -340,6 +340,19 @@ class specParser:
                 tmpSpecFile.write(currentSpecString)
                 tmp_package_spec_path=tmpSpecFile.name
            
+        if pkgName in ["dlog"]:
+            currentSpecString=currentSpecString.replace('%{_builddir}/%{name}-%{version}/','')
+
+            with tempfile.NamedTemporaryFile(mode='w',
+                            suffix='tmp',
+                            prefix=os.path.basename(tmp_package_spec_path),
+                            delete=False) as  tmpSpecFile:
+                tmpSpecFile.write(currentSpecString)
+                tmp_package_spec_path=tmpSpecFile.name
+           
+         
+           
+           
         if pkgName in ["pciutils"]:
             currentSpecString=currentSpecString.replace('gunzip ','#gunzip ')
 
diff --git a/meta-tizen-ivi/classes/tizenBuildUtils.bbclass b/meta-tizen-ivi/classes/tizenBuildUtils.bbclass
index 6179248..989c17a 100644
--- a/meta-tizen-ivi/classes/tizenBuildUtils.bbclass
+++ b/meta-tizen-ivi/classes/tizenBuildUtils.bbclass
@@ -46,6 +46,7 @@ do_compile_prepend () {
  echo export STAGING_BASELIBDIR=${STAGING_BASELIBDIR} >> ${S}/../temp/Bash_compile
  echo export STAGING_INCDIR=${STAGING_INCDIR} >> ${S}/../temp/Bash_compile
  echo export BUILD_SYS=${BUILD_SYS} >> ${S}/../temp/Bash_compile
+ echo export TARGET_PREFIX=${TARGET_PREFIX} >> ${S}/../temp/Bash_compile
  echo export STAGING_BINDIR_NATIVE=${STAGING_BINDIR_NATIVE} >> ${S}/../temp/Bash_compile
 
  #echo export cross_compiling=yes >> ${S}/../temp/Bash_compile
@@ -73,7 +74,13 @@ do_install_prepend () {
  echo export S=${S}  > ${S}/../temp/Bash_install
  echo export D=${D}  >> ${S}/../temp/Bash_install
  echo export HOST_SYS=${HOST_SYS}  >> ${S}/../temp/Bash_install
- 
+ echo export STAGING_DIR_HOST=${STAGING_DIR_HOST} >> ${S}/../temp/Bash_install
+ echo export STAGING_LIBDIR=${STAGING_LIBDIR} >> ${S}/../temp/Bash_install
+ echo export STAGING_BASELIBDIR=${STAGING_BASELIBDIR} >> ${S}/../temp/Bash_install
+ echo export STAGING_INCDIR=${STAGING_INCDIR} >> ${S}/../temp/Bash_install
+ echo export BUILD_SYS=${BUILD_SYS} >> ${S}/../temp/Bash_install
+ echo export TARGET_PREFIX=${TARGET_PREFIX} >> ${S}/../temp/Bash_install
+ echo export STAGING_BINDIR_NATIVE=${STAGING_BINDIR_NATIVE} >> ${S}/../temp/Bash_install
 
  if [[ ${PN} =~ "-native" ]];
  then
diff --git a/meta-tizen-ivi/recipes-tizen/dlog/dlog-extraconf.inc b/meta-tizen-ivi/recipes-tizen/dlog/dlog-extraconf.inc
index e69de29..72354fa 100644
--- a/meta-tizen-ivi/recipes-tizen/dlog/dlog-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/dlog/dlog-extraconf.inc
@@ -0,0 +1,8 @@
+SRC_URI += "\
+  file://configure.ac.patch \
+  "
+  
+do_patch () {
+ echo RLM begining of python do_patch
+ cat ${WORKDIR}/configure.ac.patch | patch -s -p1 --fuzz=2
+}
\ No newline at end of file
diff --git a/meta-tizen-ivi/recipes-tizen/dlog/dlog/configure.ac.patch b/meta-tizen-ivi/recipes-tizen/dlog/dlog/configure.ac.patch
new file mode 100644
index 0000000..0891b9d
--- /dev/null
+++ b/meta-tizen-ivi/recipes-tizen/dlog/dlog/configure.ac.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index c5af179..0ca6084 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,10 @@ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_LIBTOOL
+ 
++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
++m4_pattern_allow([AM_PROG_AR])
++AM_PROG_AR
++
+ # checks arch
+ AM_CONDITIONAL(DEVELOP_VER, test $DEVELOP_VER = yes)
+ 
diff --git a/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-extraconf.inc b/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-extraconf.inc
index d513d99..1d573bd 100644
--- a/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/ncurses/ncurses-extraconf.inc
@@ -3,6 +3,7 @@ inherit autotools binconfig multilib_header
 SRC_URI += "file://tic-hang.patch \
             file://config.cache \
 "
+EXTRA_AUTORECONF = "-I m4"
 CONFIG_SITE =+ "${WORKDIR}/config.cache"
 
 
diff --git a/meta-tizen-ivi/recipes-tizen/python/python-extraconf.inc b/meta-tizen-ivi/recipes-tizen/python/python-extraconf.inc
index f52ff41..758fe90 100644
--- a/meta-tizen-ivi/recipes-tizen/python/python-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/python/python-extraconf.inc
@@ -1,6 +1,6 @@
 #inherit multilib_header pythonnative
 
-DEPENDS += "gdbm zlib python-native ncurses-native"
+DEPENDS += "gdbm zlib"
 
 SRC_URI += "\
   file://01-use-proper-tools-for-cross-build.patch \
@@ -10,6 +10,7 @@ SRC_URI += "\
   file://06-ctypes-libffi-fix-configure.patch \
   file://06-avoid_usr_lib_termcap_path_in_linking.patch \
   file://99-ignore-optimization-flag.patch \
+  file://setup_py_skip_cross_import_check.patch \
   file://python.spec.patch \
   "
   
@@ -22,7 +23,7 @@ do_patch () {
  cat ${WORKDIR}/06-ctypes-libffi-fix-configure.patch | patch -s -p1 --fuzz=2
  cat ${WORKDIR}/06-avoid_usr_lib_termcap_path_in_linking.patch | patch -s -p1 --fuzz=2
  cat ${WORKDIR}/99-ignore-optimization-flag.patch | patch -s -p1 --fuzz=2
- 
+ cat ${WORKDIR}/setup_py_skip_cross_import_check.patch | patch -s -p1 --fuzz=2
  cat ${WORKDIR}/python.spec.patch | patch -s -p1 --fuzz=2
 }