diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-09-19 18:18:55 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-20 19:09:06 -0700 |
commit | 290ad988fb94ccde70dcfcba573d162a5c56c339 (patch) | |
tree | c821a5f79dca4a9e286a69af004cddd44b293eb2 | |
parent | e6b7da8d871239f95df31d8572c3244206d3e1d1 (diff) | |
download | meta-openembedded-290ad988fb94ccde70dcfcba573d162a5c56c339.tar.gz |
uim: Update to 1.8.8
License-Update: Change URI from code.google.com to github.com [1]
Drop the patches they seem to be not needed
Add dependency on libedit
Disable parallel make due to races
aarch64 support is upstream so drop the patch
[1] https://github.com/uim/uim/commit/a1cf71ec3719389874c42dd4c719a15509983485#diff-7116ef0705885343c9e1b2171a06be0e
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch | 80 | ||||
-rw-r--r-- | meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-support/uim/uim/uim-module-manager.patch | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/uim/uim_1.8.8.bb (renamed from meta-oe/recipes-support/uim/uim_1.8.6.bb) | 17 |
4 files changed, 22 insertions, 103 deletions
diff --git a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch b/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch deleted file mode 100644 index 391b0e68b0..0000000000 --- a/meta-oe/recipes-support/uim/uim/0001-Add-support-for-aarch64.patch +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | From 82f44f53b9a9766c2ec816f237506beb953eb332 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Schwab <schwab@suse.de> | ||
3 | Date: Wed, 29 Oct 2014 14:18:28 +0100 | ||
4 | Subject: [PATCH] Add support for aarch64 | ||
5 | |||
6 | * include/private/gcconfig.h: Add support for aarch64. | ||
7 | |||
8 | --- | ||
9 | sigscheme/libgcroots/include/private/gcconfig.h | 37 +++++++++++++++++++++++++ | ||
10 | 1 file changed, 37 insertions(+) | ||
11 | |||
12 | diff --git a/sigscheme/libgcroots/include/private/gcconfig.h b/sigscheme/libgcroots/include/private/gcconfig.h | ||
13 | index 4d42b03..0f13db6 100644 | ||
14 | --- a/sigscheme/libgcroots/include/private/gcconfig.h | ||
15 | +++ b/sigscheme/libgcroots/include/private/gcconfig.h | ||
16 | @@ -62,6 +62,13 @@ | ||
17 | # endif | ||
18 | |||
19 | /* Determine the machine type: */ | ||
20 | +# if defined(__aarch64__) | ||
21 | +# define AARCH64 | ||
22 | +# if !defined(LINUX) | ||
23 | +# define NOSYS | ||
24 | +# define mach_type_known | ||
25 | +# endif | ||
26 | +# endif | ||
27 | # if defined(__arm__) || defined(__thumb__) | ||
28 | # define ARM32 | ||
29 | # if !defined(LINUX) && !defined(NETBSD) | ||
30 | @@ -231,6 +238,10 @@ | ||
31 | # define IA64 | ||
32 | # define mach_type_known | ||
33 | # endif | ||
34 | +# if defined(LINUX) && defined(__aarch64__) | ||
35 | +# define AARCH64 | ||
36 | +# define mach_type_known | ||
37 | +# endif | ||
38 | # if defined(LINUX) && defined(__arm__) | ||
39 | # define ARM32 | ||
40 | # define mach_type_known | ||
41 | @@ -504,6 +515,7 @@ | ||
42 | /* running Amdahl UTS4 */ | ||
43 | /* S390 ==> 390-like machine */ | ||
44 | /* running LINUX */ | ||
45 | + /* AARCH64 ==> ARM AArch64 */ | ||
46 | /* ARM32 ==> Intel StrongARM */ | ||
47 | /* IA64 ==> Intel IPF */ | ||
48 | /* (e.g. Itanium) */ | ||
49 | @@ -1724,6 +1736,31 @@ | ||
50 | # endif | ||
51 | # endif | ||
52 | |||
53 | +# ifdef AARCH64 | ||
54 | +# define CPP_WORDSZ 64 | ||
55 | +# define MACH_TYPE "AARCH64" | ||
56 | +# define ALIGNMENT 8 | ||
57 | +# ifndef HBLKSIZE | ||
58 | +# define HBLKSIZE 4096 | ||
59 | +# endif | ||
60 | +# ifdef LINUX | ||
61 | +# define OS_TYPE "LINUX" | ||
62 | +# define LINUX_STACKBOTTOM | ||
63 | +# define DYNAMIC_LOADING | ||
64 | + extern int __data_start[]; | ||
65 | +# define DATASTART ((ptr_t)__data_start) | ||
66 | + extern char _end[]; | ||
67 | +# define DATAEND ((ptr_t)(&_end)) | ||
68 | +# endif | ||
69 | +# ifdef NOSYS | ||
70 | + /* __data_start is usually defined in the target linker script. */ | ||
71 | + extern int __data_start[]; | ||
72 | +# define DATASTART ((ptr_t)__data_start) | ||
73 | + extern void *__stack_base__; | ||
74 | +# define STACKBOTTOM ((ptr_t)__stack_base__) | ||
75 | +# endif | ||
76 | +# endif | ||
77 | + | ||
78 | # ifdef ARM32 | ||
79 | # define CPP_WORDSZ 32 | ||
80 | # define MACH_TYPE "ARM32" | ||
diff --git a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch index 0c8f02d6ce..510a8c8407 100644 --- a/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch +++ b/meta-oe/recipes-support/uim/uim/0001-fix-bug-for-cross-compile.patch | |||
@@ -9,18 +9,16 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | |||
9 | configure.ac | 4 ++-- | 9 | configure.ac | 4 ++-- |
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 10 | 1 file changed, 2 insertions(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index 9be879c..9249bfd 100644 | ||
14 | --- a/configure.ac | 12 | --- a/configure.ac |
15 | +++ b/configure.ac | 13 | +++ b/configure.ac |
16 | @@ -1208,8 +1208,8 @@ AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support | 14 | @@ -1317,8 +1317,8 @@ if test "x$with_libedit" != xno; then |
17 | if test "x$use_libedit" != "xno"; then | 15 | |
18 | saved_CPPFLAGS=$CPPFLAGS | 16 | saved_CPPFLAGS=$CPPFLAGS |
19 | saved_LDFLAGS=$LDFLAGS | 17 | saved_LDFLAGS=$LDFLAGS |
20 | - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" | 18 | - CPPFLAGS="${CPPFLAGS} -I$libedit_path/include" |
21 | - LDFLAGS="${LDFLAGS} -L$libedit_path/lib" | 19 | - LDFLAGS="${LDFLAGS} -L$libedit_path/lib" |
22 | + CPPFLAGS="${CPPFLAGS} " | 20 | + CPPFLAGS="${CPPFLAGS}" |
23 | + LDFLAGS="${LDFLAGS} " | 21 | + LDFLAGS="${LDFLAGS}" |
24 | AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", | 22 | AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses", |
25 | [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", | 23 | [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses", |
26 | AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") | 24 | AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...") |
diff --git a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch index 3078af0586..0fafc8533e 100644 --- a/meta-oe/recipes-support/uim/uim/uim-module-manager.patch +++ b/meta-oe/recipes-support/uim/uim/uim-module-manager.patch | |||
@@ -6,11 +6,9 @@ Date: Fri, 26 Jun 2015 12:57:48 +0900 | |||
6 | scm/Makefile.am | 2 +- | 6 | scm/Makefile.am | 2 +- |
7 | 1 file changed, 1 insertion(+), 1 deletion(-) | 7 | 1 file changed, 1 insertion(+), 1 deletion(-) |
8 | 8 | ||
9 | diff --git a/scm/Makefile.am b/scm/Makefile.am | ||
10 | index 14d9393..e8a1083 100644 | ||
11 | --- a/scm/Makefile.am | 9 | --- a/scm/Makefile.am |
12 | +++ b/scm/Makefile.am | 10 | +++ b/scm/Makefile.am |
13 | @@ -119,7 +119,7 @@ if EXPAT | 11 | @@ -115,7 +115,7 @@ if EXPAT |
14 | module_names += "yahoo-jp" | 12 | module_names += "yahoo-jp" |
15 | endif | 13 | endif |
16 | 14 | ||
diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.8.bb index 1c58d40b1d..cc28e6e8fd 100644 --- a/meta-oe/recipes-support/uim/uim_1.8.6.bb +++ b/meta-oe/recipes-support/uim/uim_1.8.8.bb | |||
@@ -1,19 +1,19 @@ | |||
1 | DESCRIPTION = "A multilingual user input method library" | 1 | DESCRIPTION = "A multilingual user input method library" |
2 | HOMEPAGE = "http://uim.freedesktop.org/" | 2 | HOMEPAGE = "http://uim.freedesktop.org/" |
3 | LICENSE = "BSD-3-Clause & LGPLv2+" | 3 | LICENSE = "BSD-3-Clause & LGPLv2+" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=32463fd29aa303fb2360faeeae17256b" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=ab2826b41ca0ff4030d38cc39791d1c8" |
5 | SECTION = "inputmethods" | 5 | SECTION = "inputmethods" |
6 | 6 | ||
7 | SRC_URI = "https://github.com/uim/uim/releases/download/uim-${PV}/uim-${PV}.tar.bz2" | 7 | SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2" |
8 | 8 | ||
9 | SRC_URI_append_class-target = " file://uim-module-manager.patch \ | 9 | SRC_URI_append_class-target = "\ |
10 | file://uim-module-manager.patch \ | ||
10 | file://0001-fix-bug-for-cross-compile.patch \ | 11 | file://0001-fix-bug-for-cross-compile.patch \ |
11 | file://0001-Add-support-for-aarch64.patch \ | ||
12 | " | 12 | " |
13 | SRC_URI[md5sum] = "ecea4c597bab1fd4ba98ea84edcece59" | 13 | SRC_URI[md5sum] = "01c7bd5d0d4f3a9f6f5befe6f57a470b" |
14 | SRC_URI[sha256sum] = "7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f" | 14 | SRC_URI[sha256sum] = "34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc" |
15 | 15 | ||
16 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool" | 16 | DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" |
17 | DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" | 17 | DEPENDS_append_class-target = " intltool-native gtk+ gtk+3 uim-native takao-fonts" |
18 | 18 | ||
19 | RDEPENDS_uim = "libuim0 libedit" | 19 | RDEPENDS_uim = "libuim0 libedit" |
@@ -39,6 +39,9 @@ EXTRA_OECONF += "--disable-emacs \ | |||
39 | 39 | ||
40 | CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" | 40 | CONFIGUREOPTS_remove_class-target = "--disable-silent-rules" |
41 | 41 | ||
42 | # https://github.com/uim/uim/issues/44 | ||
43 | PARALLEL_MAKE = "" | ||
44 | |||
42 | #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. | 45 | #Because m4 file's find maxdepth=2, so copy the m4 files of the deep depth. |
43 | do_configure_prepend () { | 46 | do_configure_prepend () { |
44 | cp ${S}/sigscheme/m4/* ${S}/m4/ | 47 | cp ${S}/sigscheme/m4/* ${S}/m4/ |