[oe] [PATCH 06/18] netkit-base-0.17: fix compile with gcc-4.x

[Paul Menzel]

Am Mittwoch, den 29.09.2010, 20:36 +0000 schrieb Andreas Oberritter:
> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
> ---
>  .../netkit-base-0.17/gcc4_buildfix.patch           |   11 +++++++++++
>  recipes/netkit-base/netkit-base_0.17.bb            |    3 ++-
>  2 files changed, 13 insertions(+), 1 deletions(-)
>  create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
> 
> diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
> new file mode 100644
> index 0000000..f284f1a

As written in my answer to your introductory message [1], it would be
nice to add a patch header [2].

> --- /dev/null
> +++ b/recipes/netkit-base/netkit-base-0.17/gcc4_buildfix.patch
> @@ -0,0 +1,11 @@
> +--- bla/inetd/servtab.c	2000-07-22 22:20:50.000000000 +0200
> ++++ bla/inetd/servtab.c	2006-03-01 15:26:46.000000000 +0100
> +@@ -771,7 +771,7 @@
> + 			return;
> + 		}
> + 		
> +-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
> ++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
> + 
> + 		/*
> + 		 * sep->se_wait may be holding the pid of a daemon
> diff --git a/recipes/netkit-base/netkit-base_0.17.bb b/recipes/netkit-base/netkit-base_0.17.bb
> index c9864ae..4e70164 100644
> --- a/recipes/netkit-base/netkit-base_0.17.bb
> +++ b/recipes/netkit-base/netkit-base_0.17.bb
> @@ -1,11 +1,12 @@
>  SECTION = "base"
>  DESCRIPTION = "netkit-base includes the inetd daemon."
>  LICENSE = "BSD"
> -PR = "r1"
> +PR = "r2"
>  
>  SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-${PV}.tar.gz \
>             file://configure.patch \
>             file://mconfig.patch \
> +           file://gcc4_buildfix.patch \
>             file://init \
>             file://inetd.conf"

I build tested your patch for `MACHINE = "beagleboard"` for the
distributions `minimal-{libc,eglibc,uclibc}` and it worked. It compiled
for `angstrom-2008.1` but failed with a quality assurance warning which
probably has been there before and is for a separate patch.
        
        $ more /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/temp/log.package_do_package.4223 
     ERROR: QA Issue with netkit-base: No GNU_HASH in the elf binary: '/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/packages-split/netkit-base/usr/sbin/inetd'
     FATAL: QA run found fatal errors. Please consider fixing them.
     ERROR: Error in executing python function in: /oe/openembedded/recipes/netkit-base/netkit-base_0.17.bb
     ERROR: Exception:<type 'exceptions.SystemExit'> Message:1
     ERROR: Printing the environment of the function
     ERROR: Function do_package_qa failed

        $ more /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/temp/log.qa_package 
     LDFLAGS ignored, netkit-base, /work/armv7a-angstrom-linux-gnueabi/netkit-base-0.17-r2/packages-split/netkit-base/usr/sbin/inetd


Acked-by: Paul Menzel <paulepanter at users.sourceforge.net>


Thanks,

Paul


[1] http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-September/024859.html
[2] http://wiki.openembedded.net/index.php/Push_patches_upstream
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20100930/1be5e9b6/attachment-0002.sig>