Patchworkβ [oe] netkit-base: fix building with gcc4

login
register
about
Submitter Pieter Grimmerink
Date 2009-10-29 14:36:25
Message ID <200910291536.26049.pieterg@gmx.com>
Download mbox | patch
Permalink /patch/1187/
State Changes Requested
Headers show

Comments

Pieter Grimmerink - 2009-10-29 14:36:25
---

I guess nobody has been using netkit-base for a while, it needs the 
following patch to allow it to be built with gcc 4.x.x.

 recipes/netkit-base/netkit-base-0.17/gcc4.patch |   12 ++++++++++++
 recipes/netkit-base/netkit-base_0.17.bb         |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4.patch

            file://inetd.conf"
Stefan Schmidt - 2010-02-15 20:58:22
Hello.

Sorry for the late reply. I was going to test and apply your patch, but it is
line wrapped and I failed fixing it up by hand.

On Thu, 2009-10-29 at 15:36, pieterg wrote:
> ---
> 
> I guess nobody has been using netkit-base for a while, it needs the 
> following patch to allow it to be built with gcc 4.x.x.
> 
>  recipes/netkit-base/netkit-base-0.17/gcc4.patch |   12 ++++++++++++
>  recipes/netkit-base/netkit-base_0.17.bb         |    3 ++-
>  2 files changed, 14 insertions(+), 1 deletions(-)
>  create mode 100644 recipes/netkit-base/netkit-base-0.17/gcc4.patch
> 
> diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4.patch 
> b/recipes/netkit-base/netkit-base-0.17/gcc4.patch
> new file mode 100644
> index 0000000..0a332a8
> --- /dev/null
> +++ b/recipes/netkit-base/netkit-base-0.17/gcc4.patch
> @@ -0,0 +1,12 @@
> +diff -dur netkit-base-0.17-p/inetd/servtab.c 
> netkit-base-0.17/inetd/servtab.c

Here

> +--- netkit-base-0.17-p/inetd/servtab.c	2000-07-22 22:20:50.000000000 +0200
> ++++ netkit-base-0.17/inetd/servtab.c	2005-10-19 04:04:33.000000000 +0200
> +@@ -771,7 +771,7 @@
> + 			return;
> + 		}
> + 		
> +-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; 
> (type)b=(type)c;}

Here, and more to come.

regards
Stefan Schmidt

Patch

diff --git a/recipes/netkit-base/netkit-base-0.17/gcc4.patch 
b/recipes/netkit-base/netkit-base-0.17/gcc4.patch
new file mode 100644
index 0000000..0a332a8
--- /dev/null
+++ b/recipes/netkit-base/netkit-base-0.17/gcc4.patch
@@ -0,0 +1,12 @@ 
+diff -dur netkit-base-0.17-p/inetd/servtab.c 
netkit-base-0.17/inetd/servtab.c
+--- netkit-base-0.17-p/inetd/servtab.c	2000-07-22 22:20:50.000000000 +0200
++++ netkit-base-0.17/inetd/servtab.c	2005-10-19 04:04:33.000000000 +0200
+@@ -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 88016ea..c910b29 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;patch=1 \
            file://mconfig.patch;patch=1 \
+           file://gcc4.patch;patch=1 \
            file://init \