Re: [OE-core] [PATCH 05/45] sip.bbclass: remove

[alexander . kanavin]

> The pyqt recipe in meta-qt4 uses sip.

It's using the sip recipe, but not the sip class. I don't see anything in
meta-qt4 that is using the class, do you?


Alex
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 05/45] sip.bbclass: remove

[Philip Balister]

The pyqt recipe in meta-qt4 uses sip.

Philip

On 05/24/2016 07:53 AM, Alexander Kanavin wrote:
> Nothing is requiring it in oe-core or meta-oe.
> 
> Signed-off-by: Alexander Kanavin 
> ---
>  meta/classes/sip.bbclass | 61 
> 
>  1 file changed, 61 deletions(-)
>  delete mode 100644 meta/classes/sip.bbclass
> 
> diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
> deleted file mode 100644
> index 6ed2a13..000
> --- a/meta/classes/sip.bbclass
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -# Build Class for Sip based Python Bindings
> -# (C) Michael 'Mickey' Lauer 
> -#
> -STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip"
> -
> -DEPENDS  =+ "sip-native"
> -RDEPENDS_${PN} += "python-sip"
> -
> -# default stuff, do not uncomment
> -# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
> -
> -# do_generate is before do_configure so ensure that sip_native is populated 
> in sysroot before executing it
> -do_generate[depends] += "sip-native:do_populate_sysroot"
> -
> -sip_do_generate() {
> - if [ -z "${SIP_MODULES}" ]; then 
> - MODULES="`ls sip/*mod.sip`"
> - else
> - MODULES="${SIP_MODULES}"
> - fi
> -
> - if [ -z "$MODULES" ]; then
> - die "SIP_MODULES not set and no modules found in $PWD"
> -else
> - bbnote "using modules '${SIP_MODULES}' and tags 
> '${EXTRA_SIPTAGS}'"
> - fi
> -
> - if [ -z "${EXTRA_SIPTAGS}" ]; then
> - die "EXTRA_SIPTAGS needs to be set!"
> - else
> - SIPTAGS="${EXTRA_SIPTAGS}"
> - fi
> -
> - if [ ! -z "${SIP_FEATURES}" ]; then
> - FEATURES="-z ${SIP_FEATURES}"
> - bbnote "sip feature file: ${SIP_FEATURES}"
> - fi
> -
> - for module in $MODULES
> - do
> - install -d ${module}/
> - echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} 
> ${FEATURES} -c ${module} -b ${module}/${module}.pro.in 
> sip/${module}/${module}mod.sip'"
> - sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c 
> ${module} -b ${module}/${module}.sbf \
> - sip/${module}/${module}mod.sip || die "Error calling 
> sip on ${module}"
> - sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e 
> 's,headers,HEADERS,' \
> - ${module}/${module}.sbf | sed s,"moc_HEADERS 
> =","HEADERS +=", \
> - >${module}/${module}.pro
> - echo "TEMPLATE=lib" >>${module}/${module}.pro
> - [ "${module}" = "qt" ]  && echo ""  
> >>${module}/${module}.pro
> - [ "${module}" = "qtcanvas" ]&& echo ""  
> >>${module}/${module}.pro
> - [ "${module}" = "qttable" ] && echo ""  
> >>${module}/${module}.pro
> - [ "${module}" = "qwt" ] && echo ""  
> >>${module}/${module}.pro
> - [ "${module}" = "qtpe" ]&& echo ""  
> >>${module}/${module}.pro
> - [ "${module}" = "qtpe" ]&& echo "LIBS+=-lqpe"   
> >>${module}/${module}.pro
> - true
> - done
> -}
> -
> -EXPORT_FUNCTIONS do_generate
> -
> -addtask generate after do_unpack do_patch before do_configure
> 
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 05/45] sip.bbclass: remove

[Alexander Kanavin]

Nothing is requiring it in oe-core or meta-oe.

Signed-off-by: Alexander Kanavin 
---
 meta/classes/sip.bbclass | 61 
 1 file changed, 61 deletions(-)
 delete mode 100644 meta/classes/sip.bbclass

diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass
deleted file mode 100644
index 6ed2a13..000
--- a/meta/classes/sip.bbclass
+++ /dev/null
@@ -1,61 +0,0 @@
-# Build Class for Sip based Python Bindings
-# (C) Michael 'Mickey' Lauer 
-#
-STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip"
-
-DEPENDS  =+ "sip-native"
-RDEPENDS_${PN} += "python-sip"
-
-# default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
-
-# do_generate is before do_configure so ensure that sip_native is populated in 
sysroot before executing it
-do_generate[depends] += "sip-native:do_populate_sysroot"
-
-sip_do_generate() {
-   if [ -z "${SIP_MODULES}" ]; then 
-   MODULES="`ls sip/*mod.sip`"
-   else
-   MODULES="${SIP_MODULES}"
-   fi
-
-   if [ -z "$MODULES" ]; then
-   die "SIP_MODULES not set and no modules found in $PWD"
-else
-   bbnote "using modules '${SIP_MODULES}' and tags 
'${EXTRA_SIPTAGS}'"
-   fi
-
-   if [ -z "${EXTRA_SIPTAGS}" ]; then
-   die "EXTRA_SIPTAGS needs to be set!"
-   else
-   SIPTAGS="${EXTRA_SIPTAGS}"
-   fi
-
-   if [ ! -z "${SIP_FEATURES}" ]; then
-   FEATURES="-z ${SIP_FEATURES}"
-   bbnote "sip feature file: ${SIP_FEATURES}"
-   fi
-
-   for module in $MODULES
-   do
-   install -d ${module}/
-   echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} 
${FEATURES} -c ${module} -b ${module}/${module}.pro.in 
sip/${module}/${module}mod.sip'"
-   sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c 
${module} -b ${module}/${module}.sbf \
-   sip/${module}/${module}mod.sip || die "Error calling 
sip on ${module}"
-   sed -e 's,target,TARGET,' -e 's,sources,SOURCES,' -e 
's,headers,HEADERS,' \
-   ${module}/${module}.sbf | sed s,"moc_HEADERS 
=","HEADERS +=", \
-   >${module}/${module}.pro
-   echo "TEMPLATE=lib" >>${module}/${module}.pro
-   [ "${module}" = "qt" ]  && echo ""  
>>${module}/${module}.pro
-   [ "${module}" = "qtcanvas" ]&& echo ""  
>>${module}/${module}.pro
-   [ "${module}" = "qttable" ] && echo ""  
>>${module}/${module}.pro
-   [ "${module}" = "qwt" ] && echo ""  
>>${module}/${module}.pro
-   [ "${module}" = "qtpe" ]&& echo ""  
>>${module}/${module}.pro
-   [ "${module}" = "qtpe" ]&& echo "LIBS+=-lqpe"   
>>${module}/${module}.pro
-   true
-   done
-}
-
-EXPORT_FUNCTIONS do_generate
-
-addtask generate after do_unpack do_patch before do_configure
-- 
2.8.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core