* [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie
@ 2017-06-03 4:58 Khem Raj
2017-06-03 4:58 ` [meta-python][PATCH 2/4] python-numeric: Fix build with musl Khem Raj
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Khem Raj @ 2017-06-03 4:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../recipes-multimedia/caps/caps/append_ldflags.patch | 18 ++++++++++++++++++
meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb | 1 +
2 files changed, 19 insertions(+)
create mode 100644 meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
diff --git a/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch b/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
new file mode 100644
index 000000000..3abd38189
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
@@ -0,0 +1,18 @@
+Change the order of linker flags such that -shared is appearig after -pie/-fpie
+this helps in building the package when secuiry flags are enabled
+
+-Khem
+
+Index: caps-0.9.24/Makefile
+===================================================================
+--- caps-0.9.24.orig/Makefile
++++ caps-0.9.24/Makefile
+@@ -14,7 +14,7 @@ STRIP = strip
+ -include defines.make
+
+ CFLAGS += $(OPTS) $(_CFLAGS)
+-LDFLAGS += $(_LDFLAGS) $(CFLAGS)
++LDFLAGS += $(CFLAGS) $(_LDFLAGS)
+
+ PLUG = caps
+
diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
index 90a28360c..d7887635e 100644
--- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
+++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
@@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \
file://Avoid-ambiguity-in-div-invocation.patch \
file://0001-basic.h-Use-c99-supported-stdint-types.patch \
+ file://append_ldflags.patch \
"
SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626"
--
2.13.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-python][PATCH 2/4] python-numeric: Fix build with musl
2017-06-03 4:58 [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie Khem Raj
@ 2017-06-03 4:58 ` Khem Raj
2017-06-03 15:22 ` akuster808
2017-06-03 4:58 ` [meta-oe][PATCH 3/4] openipmi: " Khem Raj
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2017-06-03 4:58 UTC (permalink / raw)
To: openembedded-devel
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
+
+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
--
2.13.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-oe][PATCH 3/4] openipmi: Fix build with musl
2017-06-03 4:58 [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie Khem Raj
2017-06-03 4:58 ` [meta-python][PATCH 2/4] python-numeric: Fix build with musl Khem Raj
@ 2017-06-03 4:58 ` Khem Raj
2017-06-03 15:18 ` akuster808
2017-06-03 4:58 ` [meta-networking][PATCH 4/4] samba: " Khem Raj
2017-06-03 15:21 ` [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie akuster808
3 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2017-06-03 4:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../openipmi/files/include_sys_types.patch | 17 +++++++++++++++++
meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb | 1 +
2 files changed, 18 insertions(+)
create mode 100644 meta-oe/recipes-support/openipmi/files/include_sys_types.patch
diff --git a/meta-oe/recipes-support/openipmi/files/include_sys_types.patch b/meta-oe/recipes-support/openipmi/files/include_sys_types.patch
new file mode 100644
index 000000000..58ec5d883
--- /dev/null
+++ b/meta-oe/recipes-support/openipmi/files/include_sys_types.patch
@@ -0,0 +1,17 @@
+include sys/types.h for u_int32_t
+
+ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
+ u_int32_t addr;
+ ^~~~~~~~~
+Index: OpenIPMI-2.0.22/ui/ui.c
+===================================================================
+--- OpenIPMI-2.0.22.orig/ui/ui.c
++++ OpenIPMI-2.0.22/ui/ui.c
+@@ -42,6 +42,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <ctype.h>
+
+ #include <OpenIPMI/selector.h>
diff --git a/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb b/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb
index 82e8cac3e..9f4b0ff26 100644
--- a/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb
+++ b/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb
@@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
file://ipmi-init-fix-the-arguments.patch \
file://makefile-add-ldflags.patch \
file://do-not-install-pyc-and-pyo.patch \
+ file://include_sys_types.patch \
file://openipmi-helper \
file://ipmi.service \
"
--
2.13.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [meta-networking][PATCH 4/4] samba: Fix build with musl
2017-06-03 4:58 [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie Khem Raj
2017-06-03 4:58 ` [meta-python][PATCH 2/4] python-numeric: Fix build with musl Khem Raj
2017-06-03 4:58 ` [meta-oe][PATCH 3/4] openipmi: " Khem Raj
@ 2017-06-03 4:58 ` Khem Raj
2017-06-03 15:19 ` akuster808
2017-06-03 15:21 ` [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie akuster808
3 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2017-06-03 4:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../recipes-connectivity/samba/samba/glibc_only.patch | 15 +++++++++++++++
.../samba/samba/netdb_defines.patch | 19 +++++++++++++++++++
.../recipes-connectivity/samba/samba_4.6.2.bb | 2 ++
3 files changed, 36 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
create mode 100644 meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
diff --git a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
new file mode 100644
index 000000000..894bc8bb2
--- /dev/null
+++ b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
@@ -0,0 +1,15 @@
+Index: samba-4.6.2/ctdb/tests/src/test_mutex_raw.c
+===================================================================
+--- samba-4.6.2.orig/ctdb/tests/src/test_mutex_raw.c
++++ samba-4.6.2/ctdb/tests/src/test_mutex_raw.c
+@@ -166,8 +166,10 @@ int main(int argc, const char **argv)
+ if (ret == 0) {
+ pthread_mutex_unlock(mutex);
+ }
++#ifdef __GLIBC__
+ } else if (ret == EBUSY) {
+ printf("pid=%u\n", mutex->__data.__owner);
++#endif
+ } else if (ret == 0) {
+ pthread_mutex_unlock(mutex);
+ }
diff --git a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
new file mode 100644
index 000000000..eb06866f4
--- /dev/null
+++ b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
@@ -0,0 +1,19 @@
+Index: samba-4.6.2/nsswitch/wins.c
+===================================================================
+--- samba-4.6.2.orig/nsswitch/wins.c
++++ samba-4.6.2/nsswitch/wins.c
+@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex =
+ #define INADDRSZ 4
+ #endif
+
++#ifndef NETDB_INTERNAL
++#define NETDB_INTERNAL (-1)
++#endif
++
++#ifndef NETDB_SUCCESS
++#define NETDB_SUCCESS 0
++#endif
++
+ NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
+ struct hostent *he,
+ char *buffer,
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb
index 38876c2c3..7574aefb4 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb
@@ -18,6 +18,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
file://21-add-config-option-without-valgrind.patch \
file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
file://0006-avoid-using-colon-in-the-checking-msg.patch \
+ file://netdb_defines.patch \
+ file://glibc_only.patch \
file://volatiles.03_samba \
"
SRC_URI_append_libc-musl = " \
--
2.13.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [meta-oe][PATCH 3/4] openipmi: Fix build with musl
2017-06-03 4:58 ` [meta-oe][PATCH 3/4] openipmi: " Khem Raj
@ 2017-06-03 15:18 ` akuster808
0 siblings, 0 replies; 9+ messages in thread
From: akuster808 @ 2017-06-03 15:18 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
Khem,
On 06/02/2017 09:58 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../openipmi/files/include_sys_types.patch | 17 +++++++++++++++++
> meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb | 1 +
> 2 files changed, 18 insertions(+)
> create mode 100644 meta-oe/recipes-support/openipmi/files/include_sys_types.patch
>
> diff --git a/meta-oe/recipes-support/openipmi/files/include_sys_types.patch b/meta-oe/recipes-support/openipmi/files/include_sys_types.patch
> new file mode 100644
> index 000000000..58ec5d883
> --- /dev/null
> +++ b/meta-oe/recipes-support/openipmi/files/include_sys_types.patch
isn't this missing Upstream-Status and Signed-off-by?
- armin
> @@ -0,0 +1,17 @@
> +include sys/types.h for u_int32_t
> +
> +ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
> + u_int32_t addr;
> + ^~~~~~~~~
> +Index: OpenIPMI-2.0.22/ui/ui.c
> +===================================================================
> +--- OpenIPMI-2.0.22.orig/ui/ui.c
> ++++ OpenIPMI-2.0.22/ui/ui.c
> +@@ -42,6 +42,7 @@
> + #include <fcntl.h>
> + #include <time.h>
> + #include <sys/time.h>
> ++#include <sys/types.h>
> + #include <ctype.h>
> +
> + #include <OpenIPMI/selector.h>
> diff --git a/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb b/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb
> index 82e8cac3e..9f4b0ff26 100644
> --- a/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb
> +++ b/meta-oe/recipes-support/openipmi/openipmi_2.0.22.bb
> @@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
> file://ipmi-init-fix-the-arguments.patch \
> file://makefile-add-ldflags.patch \
> file://do-not-install-pyc-and-pyo.patch \
> + file://include_sys_types.patch \
> file://openipmi-helper \
> file://ipmi.service \
> "
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-networking][PATCH 4/4] samba: Fix build with musl
2017-06-03 4:58 ` [meta-networking][PATCH 4/4] samba: " Khem Raj
@ 2017-06-03 15:19 ` akuster808
0 siblings, 0 replies; 9+ messages in thread
From: akuster808 @ 2017-06-03 15:19 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
On 06/02/2017 09:58 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../recipes-connectivity/samba/samba/glibc_only.patch | 15 +++++++++++++++
> .../samba/samba/netdb_defines.patch | 19 +++++++++++++++++++
> .../recipes-connectivity/samba/samba_4.6.2.bb | 2 ++
> 3 files changed, 36 insertions(+)
> create mode 100644 meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
> create mode 100644 meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
>
> diff --git a/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
> new file mode 100644
> index 000000000..894bc8bb2
Isn't this missing Upstream-Status and Signed-off-by ?
- armin
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch
> @@ -0,0 +1,15 @@
> +Index: samba-4.6.2/ctdb/tests/src/test_mutex_raw.c
> +===================================================================
> +--- samba-4.6.2.orig/ctdb/tests/src/test_mutex_raw.c
> ++++ samba-4.6.2/ctdb/tests/src/test_mutex_raw.c
> +@@ -166,8 +166,10 @@ int main(int argc, const char **argv)
> + if (ret == 0) {
> + pthread_mutex_unlock(mutex);
> + }
> ++#ifdef __GLIBC__
> + } else if (ret == EBUSY) {
> + printf("pid=%u\n", mutex->__data.__owner);
> ++#endif
> + } else if (ret == 0) {
> + pthread_mutex_unlock(mutex);
> + }
> diff --git a/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
> new file mode 100644
> index 000000000..eb06866f4
> --- /dev/null
> +++ b/meta-networking/recipes-connectivity/samba/samba/netdb_defines.patch
> @@ -0,0 +1,19 @@
> +Index: samba-4.6.2/nsswitch/wins.c
> +===================================================================
> +--- samba-4.6.2.orig/nsswitch/wins.c
> ++++ samba-4.6.2/nsswitch/wins.c
> +@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex =
> + #define INADDRSZ 4
> + #endif
> +
> ++#ifndef NETDB_INTERNAL
> ++#define NETDB_INTERNAL (-1)
> ++#endif
> ++
> ++#ifndef NETDB_SUCCESS
> ++#define NETDB_SUCCESS 0
> ++#endif
> ++
> + NSS_STATUS _nss_wins_gethostbyname_r(const char *hostname,
> + struct hostent *he,
> + char *buffer,
> diff --git a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb
> index 38876c2c3..7574aefb4 100644
> --- a/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb
> +++ b/meta-networking/recipes-connectivity/samba/samba_4.6.2.bb
> @@ -18,6 +18,8 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
> file://21-add-config-option-without-valgrind.patch \
> file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
> file://0006-avoid-using-colon-in-the-checking-msg.patch \
> + file://netdb_defines.patch \
> + file://glibc_only.patch \
> file://volatiles.03_samba \
> "
> SRC_URI_append_libc-musl = " \
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie
2017-06-03 4:58 [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie Khem Raj
` (2 preceding siblings ...)
2017-06-03 4:58 ` [meta-networking][PATCH 4/4] samba: " Khem Raj
@ 2017-06-03 15:21 ` akuster808
3 siblings, 0 replies; 9+ messages in thread
From: akuster808 @ 2017-06-03 15:21 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
On 06/02/2017 09:58 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../recipes-multimedia/caps/caps/append_ldflags.patch | 18 ++++++++++++++++++
> meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb | 1 +
> 2 files changed, 19 insertions(+)
> create mode 100644 meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
>
> diff --git a/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch b/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
> new file mode 100644
> index 000000000..3abd38189
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/caps/caps/append_ldflags.patch
> @@ -0,0 +1,18 @@
> +Change the order of linker flags such that -shared is appearig after -pie/-fpie
> +this helps in building the package when secuiry flags are enabled
> +
> +-Khem
Missing Upstream-Status and Signed-off-by
- armin
> +
> +Index: caps-0.9.24/Makefile
> +===================================================================
> +--- caps-0.9.24.orig/Makefile
> ++++ caps-0.9.24/Makefile
> +@@ -14,7 +14,7 @@ STRIP = strip
> + -include defines.make
> +
> + CFLAGS += $(OPTS) $(_CFLAGS)
> +-LDFLAGS += $(_LDFLAGS) $(CFLAGS)
> ++LDFLAGS += $(CFLAGS) $(_LDFLAGS)
> +
> + PLUG = caps
> +
> diff --git a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
> index 90a28360c..d7887635e 100644
> --- a/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
> +++ b/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb
> @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
> SRC_URI = "http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \
> file://Avoid-ambiguity-in-div-invocation.patch \
> file://0001-basic.h-Use-c99-supported-stdint-types.patch \
> + file://append_ldflags.patch \
> "
>
> SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-python][PATCH 2/4] python-numeric: Fix build with musl
2017-06-03 4:58 ` [meta-python][PATCH 2/4] python-numeric: Fix build with musl Khem Raj
@ 2017-06-03 15:22 ` akuster808
2017-06-03 16:22 ` Khem Raj
0 siblings, 1 reply; 9+ messages in thread
From: akuster808 @ 2017-06-03 15:22 UTC (permalink / raw)
To: Khem Raj, openembedded-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-python][PATCH 2/4] python-numeric: Fix build with musl
2017-06-03 15:22 ` akuster808
@ 2017-06-03 16:22 ` Khem Raj
0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2017-06-03 16:22 UTC (permalink / raw)
To: akuster808, openembedded-devel
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
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-06-03 16:22 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-03 4:58 [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie Khem Raj
2017-06-03 4:58 ` [meta-python][PATCH 2/4] python-numeric: Fix build with musl Khem Raj
2017-06-03 15:22 ` akuster808
2017-06-03 16:22 ` Khem Raj
2017-06-03 4:58 ` [meta-oe][PATCH 3/4] openipmi: " Khem Raj
2017-06-03 15:18 ` akuster808
2017-06-03 4:58 ` [meta-networking][PATCH 4/4] samba: " Khem Raj
2017-06-03 15:19 ` akuster808
2017-06-03 15:21 ` [meta-multimedia][PATCH 1/4] caps: Fix buld with -pie akuster808
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.