diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-05-16 22:09:22 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-19 08:28:00 -0700 |
commit | 6ce8cef7e7446c3107ed9e9dcc5295686d77fff7 (patch) | |
tree | 2e998364a3899780a2bea0d99b16aa4c16bbe91b /meta-oe | |
parent | 972f3a4b89a5f09267fe1b2d8f8488c001415ba4 (diff) | |
download | meta-openembedded-6ce8cef7e7446c3107ed9e9dcc5295686d77fff7.tar.gz |
poke: Upgrade to 4.0
- Drop patches not needed anymore
- Package vim and emacs files into package of their own
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch | 45 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch | 11 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/poke/poke_4.0.bb (renamed from meta-oe/recipes-devtools/poke/poke_1.2.bb) | 9 |
4 files changed, 8 insertions, 104 deletions
diff --git a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch b/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch deleted file mode 100644 index a41f985eb..000000000 --- a/meta-oe/recipes-devtools/poke/poke/0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001 | ||
2 | From: "Jose E. Marchesi" <jose.marchesi@oracle.com> | ||
3 | Date: Fri, 30 Apr 2021 13:17:05 +0200 | ||
4 | Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified | ||
5 | |||
6 | 2021-04-30 Jose E. Marchesi <jemarch@gnu.org> | ||
7 | |||
8 | * configure.ac: Do not check for tcl/tk if --disable-gui is | ||
9 | specified at configure time. | ||
10 | |||
11 | (cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c) | ||
12 | [Romain: remove Changelog entry] | ||
13 | Signed-off-by: Romain Naour <romain.naour@gmail.com> | ||
14 | --- | ||
15 | Upstream-Status: Pending | ||
16 | |||
17 | configure.ac | 9 ++++++--- | ||
18 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index c7205513..c2f0760a 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -214,12 +214,15 @@ fi | ||
25 | dnl The GUI is optional, and depends on the availability of Tcl and | ||
26 | dnl Tk. | ||
27 | |||
28 | -POKE_TCLTK | ||
29 | - | ||
30 | AC_ARG_ENABLE([gui], | ||
31 | AS_HELP_STRING([--enable-gui], | ||
32 | [Enable the GUI (default is YES)]), | ||
33 | - [gui_enabled=$enableval], [gui_enabled=$has_tcltk]) | ||
34 | + [gui_enabled=$enableval], [gui_enabled=yes]) | ||
35 | + | ||
36 | +if test "x$gui_enabled" = "xyes"; then | ||
37 | + POKE_TCLTK | ||
38 | + gui_enabled=$has_tcltk | ||
39 | +fi | ||
40 | |||
41 | AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"]) | ||
42 | |||
43 | -- | ||
44 | 2.30.2 | ||
45 | |||
diff --git a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch b/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch deleted file mode 100644 index 660b19f51..000000000 --- a/meta-oe/recipes-devtools/poke/poke/0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From c37419e459bd5863534719fa50755174d0912e6d Mon Sep 17 00:00:00 2001 | ||
2 | From: Romain Naour <romain.naour@gmail.com> | ||
3 | Date: Fri, 30 Apr 2021 14:32:21 +0200 | ||
4 | Subject: [PATCH] jitter: jitter-config.in: avoit host poisoning while | ||
5 | cross-compiling | ||
6 | |||
7 | When jitter is bundled into another project (poke), jitter-config --cppflags | ||
8 | return an unsafe path "-I /usr/include". | ||
9 | |||
10 | In the context of Buildroot, such configuration script woulf be "fixed" | ||
11 | after installation. But jitter-config is not installed by poke since it's | ||
12 | build as static library and liked to poke. | ||
13 | |||
14 | For now, patch jitter-config.in instead of jitter-config.in.m4sh since | ||
15 | there is an issue while converting the M4sh m4sh script ( .in.m4sh ) | ||
16 | into a portable shell script ( .in ) ready to be processed by aclocal | ||
17 | for @-substitutions. | ||
18 | |||
19 | [1] https://git.buildroot.net/buildroot/tree/package/pkg-generic.mk?h=2021.02.1#n291 | ||
20 | |||
21 | Signed-off-by: Romain Naour <romain.naour@gmail.com> | ||
22 | --- | ||
23 | Upstream-Status: Pending | ||
24 | |||
25 | jitter/bin/jitter-config.in | 6 +----- | ||
26 | 1 file changed, 1 insertion(+), 5 deletions(-) | ||
27 | |||
28 | diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in | ||
29 | index 5e124f0..af0ac9d 100644 | ||
30 | --- a/jitter/bin/jitter-config.in | ||
31 | +++ b/jitter/bin/jitter-config.in | ||
32 | @@ -998,11 +998,7 @@ while test "$#" != "0"; do | ||
33 | append_to_output cflags;; | ||
34 | --cppflags) | ||
35 | no_option_argument | ||
36 | - append_to_output cppflags | ||
37 | - # Append a -I argument. This is defined separately from the rest, | ||
38 | - # as the installation prefix can be decided very late, at Jitter | ||
39 | - # installation time. | ||
40 | - output="$output -I $includedir";; | ||
41 | + append_to_output cppflags;; | ||
42 | --ldadd) | ||
43 | no_option_argument | ||
44 | append_to_output ldadd;; | ||
45 | -- | ||
46 | 2.30.2 | ||
47 | |||
diff --git a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index ad2bf764d..67384b73d 100644 --- a/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/meta-oe/recipes-devtools/poke/poke/0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch | |||
@@ -11,18 +11,16 @@ Avoid: | |||
11 | ./../poke/poke -o ./poke.1 | 11 | ./../poke/poke -o ./poke.1 |
12 | ../run: line 51: exec: :: not found | 12 | ../run: line 51: exec: :: not found |
13 | 13 | ||
14 | Upstream-Status: Pending | ||
14 | Signed-off-by: Romain Naour <romain.naour@gmail.com> | 15 | Signed-off-by: Romain Naour <romain.naour@gmail.com> |
15 | --- | 16 | --- |
16 | Upstream-Status: Pending | ||
17 | 17 | ||
18 | configure.ac | 2 +- | 18 | configure.ac | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index c2f0760a..93769ef9 100644 | ||
23 | --- a/configure.ac | 21 | --- a/configure.ac |
24 | +++ b/configure.ac | 22 | +++ b/configure.ac |
25 | @@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) | 23 | @@ -148,7 +148,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) |
26 | if test $cross_compiling = no; then | 24 | if test $cross_compiling = no; then |
27 | AM_MISSING_PROG(HELP2MAN, help2man) | 25 | AM_MISSING_PROG(HELP2MAN, help2man) |
28 | else | 26 | else |
@@ -30,7 +28,4 @@ index c2f0760a..93769ef9 100644 | |||
30 | + HELP2MAN=true | 28 | + HELP2MAN=true |
31 | fi | 29 | fi |
32 | 30 | ||
33 | dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to | 31 | dnl The following Automake conditional is used in some Makefile.am files |
34 | -- | ||
35 | 2.30.2 | ||
36 | |||
diff --git a/meta-oe/recipes-devtools/poke/poke_1.2.bb b/meta-oe/recipes-devtools/poke/poke_4.0.bb index af85d2170..9e68ba4ea 100644 --- a/meta-oe/recipes-devtools/poke/poke_1.2.bb +++ b/meta-oe/recipes-devtools/poke/poke_4.0.bb | |||
@@ -6,14 +6,12 @@ LICENSE = "GPL-3.0-or-later" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
7 | 7 | ||
8 | SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ | 8 | SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ |
9 | file://0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch \ | ||
10 | file://0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch \ | ||
11 | file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \ | 9 | file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \ |
12 | " | 10 | " |
13 | 11 | ||
14 | DEPENDS = "flex-native bison-native bdwgc readline" | 12 | DEPENDS = "flex-native bison-native bdwgc readline" |
15 | 13 | ||
16 | SRC_URI[sha256sum] = "f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62" | 14 | SRC_URI[sha256sum] = "02bab22cb1fa6153a1b6a927c8bb3cd58d508543c144842a6d7ee74f19973a77" |
17 | 15 | ||
18 | # poke does not support using out-of-tree builds | 16 | # poke does not support using out-of-tree builds |
19 | inherit autotools-brokensep gettext pkgconfig | 17 | inherit autotools-brokensep gettext pkgconfig |
@@ -29,4 +27,7 @@ EXTRA_OECONF = "--disable-gui \ | |||
29 | 27 | ||
30 | PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c" | 28 | PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c" |
31 | 29 | ||
32 | FILES:${PN} += "${datadir}/emacs/site-lisp" | 30 | PACKAGES =+ "${PN}-emacs ${PN}-vim" |
31 | |||
32 | FILES:${PN}-emacs += "${datadir}/emacs/site-lisp" | ||
33 | FILES:${PN}-vim += "${datadir}/vim/vimfiles" | ||