projects / scm / bb / meta-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bdc2890)
Remove useless dep
authorRonan Le Martret <ronan@fridu.net>
Wed, 25 Jun 2014 18:17:25 +0000 (20:17 +0200)
committerRonan Le Martret <ronan@fridu.net>
Wed, 25 Jun 2014 18:17:25 +0000 (20:17 +0200)
Change-Id: Ie400a4ffe7c5f81ac22a95ae8a389e82cc325f91

recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc patch | blob | history
recipes-tizen/libmm-utility/libmm-utility.inc patch | blob | history
recipes-tizen/media-server/media-server-extraconf.inc patch | blob | history

diff --git a/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc b/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
index 69af128..db8262b 100644 (file)
--- a/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
+++ b/recipes-tizen/libmm-fileinfo/libmm-fileinfo.inc
@@ -35,13 +35,7 @@ do_prep() {
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q
  cp ${S}/packaging/libmm-fileinfo.manifest .
-<<<<<<< HEAD
- 
- 
-=======
 
-
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
 }
 do_patch_append() {
     bb.build.exec_func('do_prep', d)
@@ -59,17 +53,7 @@ do_compile() {
  CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
  FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-<<<<<<< HEAD
- 
- CFLAGS="${CFLAGS} -D_MM_PROJECT_FLOATER -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
- export CFLAGS
- 
- 
-   
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
-=======
+
 
  CFLAGS="${CFLAGS} -D_MM_PROJECT_FLOATER -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" "
  export CFLAGS
@@ -79,7 +63,6 @@ do_compile() {
    CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
    CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
    FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \
@@ -96,19 +79,13 @@ do_compile() {
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
          --infodir=${infodir}.sh
-<<<<<<< HEAD
- 
- 
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
-=======
+
 
 
    CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
    CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
    FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
+
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \
@@ -124,21 +101,13 @@ do_compile() {
          --localstatedir=${localstatedir} \
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
-<<<<<<< HEAD
-         --infodir=${infodir} --disable-testmode --disable-dump --enable-dyn --disable-iommap  --disable-drm --disable-gtk         
- 
- make
- 
- 
- 
-=======
          --infodir=${infodir} --disable-testmode --disable-dump --enable-dyn --disable-iommap  --disable-drm --disable-gtk
 
  make
 
 
 
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
+
 }
 
 do_install() {
@@ -149,28 +118,11 @@ do_install() {
  unset DISPLAY
  rm -rf ${D}
  mkdir -p ${D}
-<<<<<<< HEAD
- 
- 
-=======
-
 
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
-<<<<<<< HEAD
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}/${prefix}/share/license
- cp -rf ${WORKDIR}/libmm-fileinfo-0.6.0/LICENSE.APLv2.0 ${D}/${prefix}/share/license/libmm-fileinfo
- 
- 
- 
-=======
    install
    rm -f ${D}${infodir}/dir
    find ${D} -regex ".*\.la$" | xargs rm -f --
@@ -180,7 +132,7 @@ do_install() {
 
 
 
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
+
 }
 
 pkg_postinst_${PN}() {
diff --git a/recipes-tizen/libmm-utility/libmm-utility.inc b/recipes-tizen/libmm-utility/libmm-utility.inc
index 59bc6db..40255b5 100644 (file)
--- a/recipes-tizen/libmm-utility/libmm-utility.inc
+++ b/recipes-tizen/libmm-utility/libmm-utility.inc
@@ -63,17 +63,7 @@ do_compile() {
  CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
  FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
- 
-<<<<<<< HEAD
- ./autogen.sh
- 
- CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" \
- LDFLAGS+="-Wl,--rpath=${prefix}/lib -Wl,--hash-style=both -Wl,--as-needed" \
- 
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
-=======
+
 
  CFLAGS="$CFLAGS -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" -D_MM_PROJECT_FLOATER" \
  LDFLAGS+="-Wl,--rpath=${prefix}/lib -Wl,--hash-style=both -Wl,--as-needed" \
@@ -81,7 +71,6 @@ do_compile() {
    CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ;
    CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ;
    FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ;
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \
@@ -99,21 +88,14 @@ do_compile() {
          --mandir=${mandir} \
          --infodir=${infodir}
  make -j16
-<<<<<<< HEAD
- 
- sed -i -e "s#@IMGP_REQPKG@#$IMGP_REQPKG#g" imgp/mmutil-imgp.pc
- sed -i -e "s#@JPEG_REQPKG@#$JPEG_REQPKG#g" jpeg/mmutil-jpeg.pc
- 
- 
- 
-=======
+
 
  sed -i -e "s#@IMGP_REQPKG@#$IMGP_REQPKG#g" imgp/mmutil-imgp.pc
  sed -i -e "s#@JPEG_REQPKG@#$JPEG_REQPKG#g" jpeg/mmutil-jpeg.pc
 
 
 
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
+
 }
 
 do_install() {
@@ -124,29 +106,14 @@ do_install() {
  unset DISPLAY
  rm -rf ${D}
  mkdir -p ${D}
-<<<<<<< HEAD
- 
- rm -rf ${D}
- 
-=======
+
 
  rm -rf ${D}
 
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
    oe_runmake \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \
-<<<<<<< HEAD
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}/usr/share/license
- cp LICENSE ${D}/usr/share/license/libmm-utility
- 
- 
-=======
    install
    rm -f ${D}${infodir}/dir
    find ${D} -regex ".*\.la$" | xargs rm -f --
@@ -155,7 +122,7 @@ do_install() {
  cp LICENSE ${D}/usr/share/license/libmm-utility
 
 
->>>>>>> 8d29cef4325d3f19bd86954f6666d0c015ad4981
+
 }
 
 pkg_postinst_${PN}() {
diff --git a/recipes-tizen/media-server/media-server-extraconf.inc b/recipes-tizen/media-server/media-server-extraconf.inc
index 6c49508..0c02628 100644 (file)
--- a/recipes-tizen/media-server/media-server-extraconf.inc
+++ b/recipes-tizen/media-server/media-server-extraconf.inc
@@ -1 +1,7 @@
-SRC_URI += "file://Makefile.am.diff"
\ No newline at end of file
+SRC_URI += "file://Makefile.am.diff"
+
+do_install_append() {
+ rm -fr ${D}/etc
+
+
+}
\ No newline at end of file
Domain: SCM / BB;