Bump buildroot to 2019.02
This commit is contained in:
@@ -1,57 +0,0 @@
|
||||
From 0a337328411d5b3f37b169a83b6fee3f1726130f Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 26 May 2016 15:57:33 +0200
|
||||
Subject: [PATCH] Support architectures with non-empty __USER_LABEL_PREFIX__
|
||||
|
||||
On some architectures (like Blackfin), a C symbol does not directly
|
||||
match with assembly symbols. The C symbol references are in fact all
|
||||
prefixed by a so-called "user label prefix". So when a symbol defined
|
||||
in an assembly file needs to be referenced from C, this symbol should
|
||||
be prefixed by the "user label prefix".
|
||||
|
||||
This commit updates dtddata.S to take into account
|
||||
__USER_LABEL_PREFIX__ when it exists.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/dtddata.S | 19 +++++++++++++------
|
||||
1 file changed, 13 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/dtddata.S b/src/dtddata.S
|
||||
index ce51133..ad2a4db 100644
|
||||
--- a/src/dtddata.S
|
||||
+++ b/src/dtddata.S
|
||||
@@ -30,17 +30,24 @@
|
||||
|
||||
/* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */
|
||||
|
||||
+#ifdef __USER_LABEL_PREFIX__
|
||||
+#define CONCAT1(a, b) CONCAT2(a, b)
|
||||
+#define CONCAT2(a, b) a ## b
|
||||
+#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
|
||||
+#else
|
||||
+#endif
|
||||
+
|
||||
.macro binfile name file
|
||||
.p2align 2
|
||||
- .globl \name\()_begin
|
||||
-\name\()_begin:
|
||||
+ .globl SYM(\name\()_begin)
|
||||
+SYM(\name\()_begin):
|
||||
.incbin "\file"
|
||||
-\name\()_end:
|
||||
+SYM(\name\()_end):
|
||||
.byte 0
|
||||
.p2align 2
|
||||
- .globl \name\()_len
|
||||
-\name\()_len:
|
||||
- .int (\name\()_end - \name\()_begin)
|
||||
+ .globl SYM(\name\()_len)
|
||||
+SYM(\name\()_len):
|
||||
+ .int (SYM(\name\()_end) - SYM(\name\()_begin))
|
||||
.endm
|
||||
|
||||
.section .rodata
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
From 33b025e04bf3fa94b74ea3325b3fd7c3f546bcb1 Mon Sep 17 00:00:00 2001
|
||||
From 55ae8e1103f4697bfa01a84301a6560b89de5248 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 5 Mar 2017 10:06:02 +0100
|
||||
Date: Mon, 16 Apr 2018 19:52:34 +0300
|
||||
Subject: [PATCH] configure: add option to disable tests
|
||||
|
||||
When building for a product, tests are not needed.
|
||||
@@ -11,40 +11,45 @@ available.
|
||||
So, add an option to configure to disable building tests altogether.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
|
||||
Tested-by: Eric Engestrom <eric.engestrom@imgtec.com>
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
|
||||
---
|
||||
Patch submitted upstream:
|
||||
https://lists.freedesktop.org/archives/wayland-devel/2017-March/033359.html
|
||||
Changes v1 -> v2:
|
||||
- fix typo in yes-check (Eric)
|
||||
---
|
||||
Makefile.am | 3 ++-
|
||||
Makefile.am | 2 ++
|
||||
configure.ac | 8 ++++++++
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index d0c8bd3..9c2541d 100644
|
||||
index 741db5ebf9d9..4862d42959f0 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -143,7 +143,7 @@ libwayland_cursor_la_CFLAGS = \
|
||||
-I$(top_srcdir)/src \
|
||||
-DICONDIR=\"$(ICONDIR)\"
|
||||
@@ -160,6 +160,7 @@ pkgconfig_DATA += egl/wayland-egl.pc
|
||||
include_HEADERS += egl/wayland-egl-backend.h
|
||||
pkgconfig_DATA += egl/wayland-egl-backend.pc
|
||||
|
||||
-
|
||||
+if ENABLE_TESTS
|
||||
built_test_programs = \
|
||||
array-test \
|
||||
client-test \
|
||||
@@ -258,6 +258,7 @@ os_wrappers_test_LDADD = libtest-runner.la
|
||||
@@ -287,6 +288,7 @@ os_wrappers_test_LDADD = libtest-runner.la
|
||||
|
||||
exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
|
||||
exec_fd_leak_checker_LDADD = libtest-runner.la
|
||||
+endif
|
||||
|
||||
EXTRA_DIST += tests/scanner-test.sh \
|
||||
tests/data/example.xml \
|
||||
protocol/tests.xml \
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b583bef..96a5575 100644
|
||||
index c74ee97b24a2..5c94b7b76b06 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -87,10 +87,18 @@ AC_ARG_ENABLE([dtd-validation],
|
||||
@@ -89,10 +89,18 @@ AC_ARG_ENABLE([dtd-validation],
|
||||
[],
|
||||
[enable_dtd_validation=yes])
|
||||
|
||||
@@ -58,11 +63,11 @@ index b583bef..96a5575 100644
|
||||
|
||||
AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
|
||||
|
||||
+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "yes")
|
||||
+AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes)
|
||||
+
|
||||
AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here],
|
||||
[ ICONDIR=$withval],
|
||||
[ ICONDIR=${datadir}/icons])
|
||||
--
|
||||
2.7.4
|
||||
2.14.3
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2017-August/034748.html
|
||||
md5 0235f6075c32c3be61cff94fa0b9f108 wayland-1.14.0.tar.xz
|
||||
sha1 53a443be3bafe73209bbc49ef2cb134ed16e0141 wayland-1.14.0.tar.xz
|
||||
sha256 ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8 wayland-1.14.0.tar.xz
|
||||
sha512 bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5 wayland-1.14.0.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039358.html
|
||||
md5 0c215e53de71d6fb26f7102cdc6432d3 wayland-1.16.0.tar.xz
|
||||
sha1 24c63a5045c653dcfa24efd10fa7c7de89aca9ef wayland-1.16.0.tar.xz
|
||||
sha256 4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5 wayland-1.16.0.tar.xz
|
||||
sha512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c wayland-1.16.0.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WAYLAND_VERSION = 1.14.0
|
||||
WAYLAND_VERSION = 1.16.0
|
||||
WAYLAND_SITE = http://wayland.freedesktop.org/releases
|
||||
WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
|
||||
WAYLAND_LICENSE = MIT
|
||||
|
||||
Reference in New Issue
Block a user