gixxpunk
8 years ago
6 changed files with 107 additions and 70 deletions
@ -0,0 +1,44 @@ |
|||||
|
From d45f27147f7d95eb209463dc03dc039ea3f15b59 Mon Sep 17 00:00:00 2001 |
||||
|
Message-Id: <d45f27147f7d95eb209463dc03dc039ea3f15b59.1509109458.git.thomas.harfmann@gmail.com> |
||||
|
From: Baruch Siach <baruch@tkos.co.il> |
||||
|
Date: Fri, 8 Sep 2017 12:12:57 +0300 |
||||
|
Subject: [PATCH] error_prints: fix potential program_invocation_name type |
||||
|
conflict |
||||
|
MIME-Version: 1.0 |
||||
|
Content-Type: text/plain; charset=UTF-8 |
||||
|
Content-Transfer-Encoding: 8bit |
||||
|
|
||||
|
uClibc-ng declares program_invocation_name as const. |
||||
|
This causes the build failure below: |
||||
|
|
||||
|
error_prints.c:40:14: error: conflicting types for ‘program_invocation_name’ |
||||
|
extern char *program_invocation_name; |
||||
|
^~~~~~~~~~~~~~~~~~~~~~~ |
||||
|
In file included from error_prints.c:32:0: |
||||
|
.../output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/errno.h:54:20: note: previous declaration of ‘program_invocation_name’ was here |
||||
|
extern const char *program_invocation_name, *program_invocation_short_name; |
||||
|
^~~~~~~~~~~~~~~~~~~~~~~ |
||||
|
|
||||
|
* error_prints.c (program_invocation_name): Declare only in case |
||||
|
of [!HAVE_PROGRAM_INVOCATION_NAME]. |
||||
|
---
|
||||
|
error_prints.c | 2 ++ |
||||
|
1 file changed, 2 insertions(+) |
||||
|
|
||||
|
diff --git a/error_prints.c b/error_prints.c
|
||||
|
index 8519b924..710e99b0 100644
|
||||
|
--- a/error_prints.c
|
||||
|
+++ b/error_prints.c
|
||||
|
@@ -37,7 +37,9 @@
|
||||
|
|
||||
|
#include "error_prints.h" |
||||
|
|
||||
|
+#ifndef HAVE_PROGRAM_INVOCATION_NAME
|
||||
|
extern char *program_invocation_name; |
||||
|
+#endif
|
||||
|
|
||||
|
static void |
||||
|
verror_msg(int err_no, const char *fmt, va_list p) |
||||
|
--
|
||||
|
2.15.0.rc2 |
||||
|
|
||||
@ -1,48 +0,0 @@ |
|||||
From fba1b4c551cc2ccc023a070128d6fafa6f4e4af7 Mon Sep 17 00:00:00 2001 |
|
||||
Message-Id: <fba1b4c551cc2ccc023a070128d6fafa6f4e4af7.1430737869.git.gandharva@gmx.de> |
|
||||
From: gandharva <gandharva@gmx.de> |
|
||||
Date: Mon, 4 May 2015 13:10:23 +0200 |
|
||||
Subject: [PATCH] - fix build with kernel 4.x |
|
||||
|
|
||||
---
|
|
||||
configure | 6 +++--- |
|
||||
configure.ac | 6 +++--- |
|
||||
2 files changed, 6 insertions(+), 6 deletions(-) |
|
||||
|
|
||||
diff --git a/configure b/configure
|
|
||||
index 78ddf3e..d4f7a48 100755
|
|
||||
--- a/configure
|
|
||||
+++ b/configure
|
|
||||
@@ -5553,9 +5553,9 @@ $as_echo_n "checking for the kernel version... " >&6; }
|
|
||||
kernel=`uname -r` |
|
||||
|
|
||||
case "${kernel}" in |
|
||||
- 2.6.*|3.*)
|
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
|
|
||||
-$as_echo "2.6.x/3.x family (${kernel})" >&6; }
|
|
||||
+ 2.6.*|3.*|4.*)
|
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x/4.x family (${kernel})" >&5
|
|
||||
+$as_echo "2.6.x/3.x/4.x family (${kernel})" >&6; }
|
|
||||
|
|
||||
$as_echo "#define KERNEL_2_6 1" >>confdefs.h |
|
||||
|
|
||||
diff --git a/configure.ac b/configure.ac
|
|
||||
index 0fd2a41..e6b8eae 100644
|
|
||||
--- a/configure.ac
|
|
||||
+++ b/configure.ac
|
|
||||
@@ -303,9 +303,9 @@ case "${host_os}" in
|
|
||||
kernel=`uname -r` |
|
||||
|
|
||||
case "${kernel}" in |
|
||||
- 2.6.*|3.*)
|
|
||||
- AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
|
|
||||
- AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x])
|
|
||||
+ 2.6.*|3.*|4.*)
|
|
||||
+ AC_MSG_RESULT([2.6.x/3.x/4.x family (${kernel})])
|
|
||||
+ AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x, Linux 3.x or Linux 4.x])
|
|
||||
;; |
|
||||
|
|
||||
2.4.*) |
|
||||
--
|
|
||||
2.3.6 |
|
||||
|
|
||||
@ -0,0 +1,46 @@ |
|||||
|
From 9901cac770d0d81ccf1ee8e5a02abf54d18e3a04 Mon Sep 17 00:00:00 2001 |
||||
|
Message-Id: <9901cac770d0d81ccf1ee8e5a02abf54d18e3a04.1509108606.git.thomas.harfmann@gmail.com> |
||||
|
From: gixxpunk <thomas.harfmann@gmail.com> |
||||
|
Date: Fri, 27 Oct 2017 14:50:01 +0200 |
||||
|
Subject: [PATCH] - valgrind-fix-hd51-build |
||||
|
|
||||
|
---
|
||||
|
Makefile.all.am | 6 +++--- |
||||
|
configure.ac | 2 +- |
||||
|
2 files changed, 4 insertions(+), 4 deletions(-) |
||||
|
|
||||
|
diff --git a/Makefile.all.am b/Makefile.all.am
|
||||
|
index 1859a51..648a197 100644
|
||||
|
--- a/Makefile.all.am
|
||||
|
+++ b/Makefile.all.am
|
||||
|
@@ -199,11 +199,11 @@ AM_CCASFLAGS_PPC64LE_LINUX = @FLAG_M64@ -g
|
||||
|
|
||||
|
AM_FLAG_M3264_ARM_LINUX = @FLAG_M32@ |
||||
|
AM_CFLAGS_ARM_LINUX = @FLAG_M32@ \ |
||||
|
- $(AM_CFLAGS_BASE) -marm -mcpu=cortex-a8
|
||||
|
+ $(AM_CFLAGS_BASE) -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float
|
||||
|
AM_CFLAGS_PSO_ARM_LINUX = @FLAG_M32@ $(AM_CFLAGS_BASE) \ |
||||
|
- -marm -mcpu=cortex-a8 $(AM_CFLAGS_PSO_BASE)
|
||||
|
+ -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float $(AM_CFLAGS_PSO_BASE)
|
||||
|
AM_CCASFLAGS_ARM_LINUX = @FLAG_M32@ \ |
||||
|
- -marm -mcpu=cortex-a8 -g
|
||||
|
+ -mlittle-endian -march=armv7ve -mtune=cortex-a15 -mfpu=neon-vfpv4 -mhard-float -g
|
||||
|
|
||||
|
AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@ |
||||
|
AM_CFLAGS_ARM64_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) |
||||
|
diff --git a/configure.ac b/configure.ac
|
||||
|
index 3874296..0fc12f7 100644
|
||||
|
--- a/configure.ac
|
||||
|
+++ b/configure.ac
|
||||
|
@@ -234,7 +234,7 @@ case "${host_cpu}" in
|
||||
|
ARCH_MAX="s390x" |
||||
|
;; |
||||
|
|
||||
|
- armv7*)
|
||||
|
+ arm*)
|
||||
|
AC_MSG_RESULT([ok (${host_cpu})]) |
||||
|
ARCH_MAX="arm" |
||||
|
;; |
||||
|
--
|
||||
|
2.15.0.rc2 |
||||
|
|
||||
Loading…
Reference in new issue