diff mbox series

[oe,meta-python,2/4] python-numeric: Fix build with musl

Message ID 20170603045833.8120-2-raj.khem@gmail.com
State New
Headers show
Series [oe,meta-multimedia,1/4] caps: Fix buld with -pie | expand

Commit Message

Khem Raj June 3, 2017, 4:58 a.m. UTC
Use gettimeofday() definition from system

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...-define-this-function-differently-than-it.patch | 30 ++++++++++++++++++++++
 .../recipes-devtools/python/python-numeric_24.2.bb |  4 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

-- 
2.13.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Armin Kuster June 3, 2017, 3:22 p.m. UTC | #1
On 06/02/2017 09:58 PM, Khem Raj wrote:
> Use gettimeofday() definition from system

>

> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>   ...-define-this-function-differently-than-it.patch | 30 ++++++++++++++++++++++

>   .../recipes-devtools/python/python-numeric_24.2.bb |  4 ++-

>   2 files changed, 33 insertions(+), 1 deletion(-)

>   create mode 100644 meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

>

> diff --git a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

> new file mode 100644

> index 000000000..81ed744cb

> --- /dev/null

> +++ b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

> @@ -0,0 +1,30 @@

> +From 322e781c67d7a78fc2cfc3d377f50b825fc64abb Mon Sep 17 00:00:00 2001

> +From: Khem Raj <raj.khem@gmail.com>

> +Date: Fri, 2 Jun 2017 20:21:01 -0700

> +Subject: [PATCH] it tries to define this function differently than it is

> + defined in sys/time.h.

> +

> +Use the definition from system

missing Upstream-Status

> +

> +Signed-off-by: Khem Raj <raj.khem@gmail.com>

> +---

> + Packages/RNG/Src/ranf.c | 3 ---

> + 1 file changed, 3 deletions(-)

> +

> +diff --git a/Packages/RNG/Src/ranf.c b/Packages/RNG/Src/ranf.c

> +index 5ca7dc5..e669fa8 100644

> +--- a/Packages/RNG/Src/ranf.c

> ++++ b/Packages/RNG/Src/ranf.c

> +@@ -149,9 +149,6 @@ void Mixranf(int *s,u32 s48[2])

> + #else

> + 	struct timeval tv;

> + 	struct timezone tz;

> +-#if !defined(__sgi)

> +-	int gettimeofday(struct timeval *, struct timezone *);

> +-#endif

> +

> + 	(void)gettimeofday(&tv,&tz);

> + 	s48[0] = (u32)tv.tv_sec;

> +--

> +2.13.0

> +

> diff --git a/meta-python/recipes-devtools/python/python-numeric_24.2.bb b/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> index c0b04e144..c91d77c81 100644

> --- a/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> +++ b/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://Legal.htm;md5=e3ce75dedd4043918d15979ae43e312e"

>   

>   PR = "ml3"

>   

> -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz"

> +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \

> +           file://0001-it-tries-to-define-this-function-differently-than-it.patch \

> +"

>   S = "${WORKDIR}/Numeric-${PV}"

>   

>   inherit distutils


-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Khem Raj June 3, 2017, 4:22 p.m. UTC | #2
On Sat, Jun 3, 2017 at 8:22 AM akuster808 <akuster808@gmail.com> wrote:

>

>

> On 06/02/2017 09:58 PM, Khem Raj wrote:

> > Use gettimeofday() definition from system

> >

> > Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > ---

> >   ...-define-this-function-differently-than-it.patch | 30

> ++++++++++++++++++++++

> >   .../recipes-devtools/python/python-numeric_24.2.bb |  4 ++-

> >   2 files changed, 33 insertions(+), 1 deletion(-)

> >   create mode 100644

> meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

> >

> > diff --git

> a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

> b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

> > new file mode 100644

> > index 000000000..81ed744cb

> > --- /dev/null

> > +++

> b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch

> > @@ -0,0 +1,30 @@

> > +From 322e781c67d7a78fc2cfc3d377f50b825fc64abb Mon Sep 17 00:00:00 2001

> > +From: Khem Raj <raj.khem@gmail.com>

> > +Date: Fri, 2 Jun 2017 20:21:01 -0700

> > +Subject: [PATCH] it tries to define this function differently than it is

> > + defined in sys/time.h.

> > +

> > +Use the definition from system

> missing Upstream-Status



It's Pending
I don't think we do that meticulously on meta-oe but it's a good info
nevertheless I will add it

>

>

> > +

> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > +---

> > + Packages/RNG/Src/ranf.c | 3 ---

> > + 1 file changed, 3 deletions(-)

> > +

> > +diff --git a/Packages/RNG/Src/ranf.c b/Packages/RNG/Src/ranf.c

> > +index 5ca7dc5..e669fa8 100644

> > +--- a/Packages/RNG/Src/ranf.c

> > ++++ b/Packages/RNG/Src/ranf.c

> > +@@ -149,9 +149,6 @@ void Mixranf(int *s,u32 s48[2])

> > + #else

> > +     struct timeval tv;

> > +     struct timezone tz;

> > +-#if !defined(__sgi)

> > +-    int gettimeofday(struct timeval *, struct timezone *);

> > +-#endif

> > +

> > +     (void)gettimeofday(&tv,&tz);

> > +     s48[0] = (u32)tv.tv_sec;

> > +--

> > +2.13.0

> > +

> > diff --git a/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> b/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> > index c0b04e144..c91d77c81 100644

> > --- a/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> > +++ b/meta-python/recipes-devtools/python/python-numeric_24.2.bb

> > @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM =

> "file://Legal.htm;md5=e3ce75dedd4043918d15979ae43e312e"

> >

> >   PR = "ml3"

> >

> > -SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz"

> > +SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \

> > +

>  file://0001-it-tries-to-define-this-function-differently-than-it.patch \

> > +"

> >   S = "${WORKDIR}/Numeric-${PV}"

> >

> >   inherit distutils

>

>

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch
new file mode 100644
index 000000000..81ed744cb
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-numeric/0001-it-tries-to-define-this-function-differently-than-it.patch
@@ -0,0 +1,30 @@ 
+From 322e781c67d7a78fc2cfc3d377f50b825fc64abb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 2 Jun 2017 20:21:01 -0700
+Subject: [PATCH] it tries to define this function differently than it is
+ defined in sys/time.h.
+
+Use the definition from system
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Packages/RNG/Src/ranf.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Packages/RNG/Src/ranf.c b/Packages/RNG/Src/ranf.c
+index 5ca7dc5..e669fa8 100644
+--- a/Packages/RNG/Src/ranf.c
++++ b/Packages/RNG/Src/ranf.c
+@@ -149,9 +149,6 @@ void Mixranf(int *s,u32 s48[2])
+ #else
+ 	struct timeval tv;
+ 	struct timezone tz;
+-#if !defined(__sgi)
+-	int gettimeofday(struct timeval *, struct timezone *);
+-#endif
+ 
+ 	(void)gettimeofday(&tv,&tz);
+ 	s48[0] = (u32)tv.tv_sec;
+-- 
+2.13.0
+
diff --git a/meta-python/recipes-devtools/python/python-numeric_24.2.bb b/meta-python/recipes-devtools/python/python-numeric_24.2.bb
index c0b04e144..c91d77c81 100644
--- a/meta-python/recipes-devtools/python/python-numeric_24.2.bb
+++ b/meta-python/recipes-devtools/python/python-numeric_24.2.bb
@@ -5,7 +5,9 @@  LIC_FILES_CHKSUM = "file://Legal.htm;md5=e3ce75dedd4043918d15979ae43e312e"
 
 PR = "ml3"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \
+           file://0001-it-tries-to-define-this-function-differently-than-it.patch \
+"
 S = "${WORKDIR}/Numeric-${PV}"
 
 inherit distutils