[oe] [meta-oe][PATCH] sip: Update from 4.19.8 to 4.19.12.

[Philip Balister]

I also have any patch suggested by the sip developers. So do not merge
this. I'll need to test their suggestion.

Philip

On 09/07/2018 10:59 PM, Philip Balister wrote:
>  * This builds the private sip module for building PyQt5. In the
>    future we should split into a -tools and -modules. But lets fix
>    building for now
> 
> Signed-off-by: Philip Balister <philip at balister.org>
> ---
>  meta-oe/recipes-devtools/sip/files/sip.patch             | 16 ++++++++++++++++
>  .../sip/{sip_4.19.8.bb => sip_4.19.12.bb}                | 16 +++++++++-------
>  2 files changed, 25 insertions(+), 7 deletions(-)
>  create mode 100644 meta-oe/recipes-devtools/sip/files/sip.patch
>  rename meta-oe/recipes-devtools/sip/{sip_4.19.8.bb => sip_4.19.12.bb} (69%)
> 
> diff --git a/meta-oe/recipes-devtools/sip/files/sip.patch b/meta-oe/recipes-devtools/sip/files/sip.patch
> new file mode 100644
> index 000000000..78100fc4b
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/sip/files/sip.patch
> @@ -0,0 +1,16 @@
> +diff -Nurd ./sip-4.19.12.orig/configure.py sip-4.19.12/configure.py
> +--- ./sip-4.19.12.orig/configure.py	2018-07-05 05:55:19.000000000 -0400
> ++++ sip-4.19.12/configure.py	2018-09-07 16:41:18.102569271 -0400
> +@@ -949,10 +949,10 @@
> + 
> +     if len(module_path) > 1:
> +         del module_path[-1]
> +-        module_path.insert(0, sip_root_dir)
> ++        module_path.insert(0, sip_module_dir)
> +         sip_module_dir = os.path.join(*module_path)
> +     else:
> +-        sip_module_dir = sip_root_dir
> ++        sip_module_dir = sip_module_dir
> + 
> +     # Override from the command line.
> +     if opts.platform is not None:
> diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.8.bb b/meta-oe/recipes-devtools/sip/sip_4.19.12.bb
> similarity index 69%
> rename from meta-oe/recipes-devtools/sip/sip_4.19.8.bb
> rename to meta-oe/recipes-devtools/sip/sip_4.19.12.bb
> index ea944b32f..be384fd39 100644
> --- a/meta-oe/recipes-devtools/sip/sip_4.19.8.bb
> +++ b/meta-oe/recipes-devtools/sip/sip_4.19.12.bb
> @@ -4,13 +4,15 @@ SECTION = "devel"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
>  
> -inherit python-dir
> -
>  DEPENDS = "python"
>  
> -SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
> -SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727"
> -SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc"
> +inherit python-dir pythonnative
> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz \
> +           file://sip.patch \
> +          "
> +SRC_URI[md5sum] = "e28b0790dfe4962ce6bbd7c4772f40c9"                            
> +SRC_URI[sha256sum] = "24617fc31b983df075500ecac0e99d2fb48bf63ba82d4a17518659e571923822" 
>  
>  BBCLASSEXTEND = "native"
>  
> @@ -23,7 +25,7 @@ do_configure_prepend_class-target() {
>      echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
>      echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
>      echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
> -    python configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
> +    python configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
>  }
>  do_configure_prepend_class-native() {
>      echo "py_platform = linux" > sip.cfg
> @@ -32,7 +34,7 @@ do_configure_prepend_class-native() {
>      echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
>      echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
>      echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
> -    python configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
> +    python configure.py --configuration sip.cfg --sip-module PyQt5.sip --sysroot=${STAGING_DIR_NATIVE}
>  }
>  do_install() {
>      oe_runmake install
>