From d702a0e33aacee0c7fd863b3139d76569b35b9ac Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 15 Apr 2013 16:56:29 +0200 Subject: [PATCH] - solve smack. --- .../TizenGroup-IVI-Wayland/rpm_tizen_macro/yocto/macro | 2 ++ meta-tizen-ivi/classes/tizenBuildUtils.bbclass | 3 +++ meta-tizen-ivi/recipes-tizen/smack/smack-extraconf.inc | 14 ++++++++++++++ .../recipes-tizen/smack/smack/configure.ac.patch | 15 +++++++++++++++ .../recipes-tizen/smack/smack/smack.spec.patch | 18 ++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 meta-tizen-ivi/recipes-tizen/smack/smack/configure.ac.patch create mode 100644 meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch diff --git a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/yocto/macro b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/yocto/macro index e69de29..4531e79 100644 --- a/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/yocto/macro +++ b/Tizen_TZ_package/TizenGroup-IVI-Wayland/rpm_tizen_macro/yocto/macro @@ -0,0 +1,2 @@ +%buildsubdir git +%_builddir \${WORKDIR} \ No newline at end of file diff --git a/meta-tizen-ivi/classes/tizenBuildUtils.bbclass b/meta-tizen-ivi/classes/tizenBuildUtils.bbclass index 0c461b3..e679847 100644 --- a/meta-tizen-ivi/classes/tizenBuildUtils.bbclass +++ b/meta-tizen-ivi/classes/tizenBuildUtils.bbclass @@ -6,6 +6,7 @@ PACKAGING = "${S}" do_patch_prepend () { echo RLM do_patch_prepend echo export S=${S} > ${WORKDIR}/temp/Bash_patch + echo export WORKDIR=${WORKDIR} >> ${WORKDIR}/temp/Bash_patch echo export PACKAGING=${PACKAGING} >> ${WORKDIR}/temp/Bash_patch echo export HOST_SYS=${HOST_SYS} >> ${WORKDIR}/temp/Bash_patch #RLM fix gmp @@ -46,6 +47,7 @@ do_compile_prepend () { mkdir -p ${WORKDIR}/temp echo export S=${S} > ${WORKDIR}/temp/Bash_compile + echo export WORKDIR=${WORKDIR} >> ${WORKDIR}/temp/Bash_compile echo export HOST_SYS=${HOST_SYS} >> ${WORKDIR}/temp/Bash_compile echo export STAGING_DIR_HOST=${STAGING_DIR_HOST} >> ${WORKDIR}/temp/Bash_compile echo export STAGING_LIBDIR=${STAGING_LIBDIR} >> ${WORKDIR}/temp/Bash_compile @@ -80,6 +82,7 @@ do_install_prepend () { mkdir -p ${WORKDIR}/temp echo export S=${S} > ${WORKDIR}/temp/Bash_install echo export D=${D} >> ${WORKDIR}/temp/Bash_install + echo export WORKDIR=${WORKDIR} >> ${WORKDIR}/temp/Bash_install echo export HOST_SYS=${HOST_SYS} >> ${WORKDIR}/temp/Bash_install echo export STAGING_DIR_HOST=${STAGING_DIR_HOST} >> ${WORKDIR}/temp/Bash_install echo export STAGING_LIBDIR=${STAGING_LIBDIR} >> ${WORKDIR}/temp/Bash_install diff --git a/meta-tizen-ivi/recipes-tizen/smack/smack-extraconf.inc b/meta-tizen-ivi/recipes-tizen/smack/smack-extraconf.inc index e69de29..fbb1ef0 100644 --- a/meta-tizen-ivi/recipes-tizen/smack/smack-extraconf.inc +++ b/meta-tizen-ivi/recipes-tizen/smack/smack-extraconf.inc @@ -0,0 +1,14 @@ +SRC_URI += " \ + file://smack.spec.patch \ + file://configure.ac.patch \ + " + +EXTRA_AUTORECONF = " --install --symlink" + +do_patch () { + echo RLM begining of do_patch + cat ${WORKDIR}/smack.spec.patch | patch -s -p1 --fuzz=2 + cat ${WORKDIR}/configure.ac.patch | patch -s -p1 --fuzz=2 + echo RLM end of do_patch +} + \ No newline at end of file diff --git a/meta-tizen-ivi/recipes-tizen/smack/smack/configure.ac.patch b/meta-tizen-ivi/recipes-tizen/smack/smack/configure.ac.patch new file mode 100644 index 0000000..804c579 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/smack/smack/configure.ac.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 9f9ce2b..8e3e8fe 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,6 +13,10 @@ AM_SILENT_RULES([yes]) + LT_INIT([disable-static]) + AC_PREFIX_DEFAULT([/usr]) + ++# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it ++m4_pattern_allow([AM_PROG_AR]) ++AM_PROG_AR ++ + AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen], []) + AC_MSG_CHECKING([for doxygen]) + if test ! -z "$DOXYGEN"; then diff --git a/meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch b/meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch new file mode 100644 index 0000000..5abbed4 --- /dev/null +++ b/meta-tizen-ivi/recipes-tizen/smack/smack/smack.spec.patch @@ -0,0 +1,18 @@ +diff --git a/packaging/smack.spec b/packaging/smack.spec +index 69d47de..619d595 100644 +--- a/packaging/smack.spec ++++ b/packaging/smack.spec +@@ -31,11 +31,11 @@ Tools provided to load and unload rules from the kernel and query the policy + + %prep + %setup -q +-autoreconf --install --symlink ++#autoreconf --install --symlink + + %build + %configure +-make %{?_smp_mflags} ++%__make %{?_smp_mflags} + + %install + rm -rf %{buildroot} -- 2.7.4