mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
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>
This commit is contained in:
Khem Raj
parent
972f3a4b89
commit
6ce8cef7e7
|
|
@ -1,45 +0,0 @@
|
|||
From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001
|
||||
From: "Jose E. Marchesi" <jose.marchesi@oracle.com>
|
||||
Date: Fri, 30 Apr 2021 13:17:05 +0200
|
||||
Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified
|
||||
|
||||
2021-04-30 Jose E. Marchesi <jemarch@gnu.org>
|
||||
|
||||
* configure.ac: Do not check for tcl/tk if --disable-gui is
|
||||
specified at configure time.
|
||||
|
||||
(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c)
|
||||
[Romain: remove Changelog entry]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
configure.ac | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c7205513..c2f0760a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -214,12 +214,15 @@ fi
|
||||
dnl The GUI is optional, and depends on the availability of Tcl and
|
||||
dnl Tk.
|
||||
|
||||
-POKE_TCLTK
|
||||
-
|
||||
AC_ARG_ENABLE([gui],
|
||||
AS_HELP_STRING([--enable-gui],
|
||||
[Enable the GUI (default is YES)]),
|
||||
- [gui_enabled=$enableval], [gui_enabled=$has_tcltk])
|
||||
+ [gui_enabled=$enableval], [gui_enabled=yes])
|
||||
+
|
||||
+if test "x$gui_enabled" = "xyes"; then
|
||||
+ POKE_TCLTK
|
||||
+ gui_enabled=$has_tcltk
|
||||
+fi
|
||||
|
||||
AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"])
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From c37419e459bd5863534719fa50755174d0912e6d Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 30 Apr 2021 14:32:21 +0200
|
||||
Subject: [PATCH] jitter: jitter-config.in: avoit host poisoning while
|
||||
cross-compiling
|
||||
|
||||
When jitter is bundled into another project (poke), jitter-config --cppflags
|
||||
return an unsafe path "-I /usr/include".
|
||||
|
||||
In the context of Buildroot, such configuration script woulf be "fixed"
|
||||
after installation. But jitter-config is not installed by poke since it's
|
||||
build as static library and liked to poke.
|
||||
|
||||
For now, patch jitter-config.in instead of jitter-config.in.m4sh since
|
||||
there is an issue while converting the M4sh m4sh script ( .in.m4sh )
|
||||
into a portable shell script ( .in ) ready to be processed by aclocal
|
||||
for @-substitutions.
|
||||
|
||||
[1] https://git.buildroot.net/buildroot/tree/package/pkg-generic.mk?h=2021.02.1#n291
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
jitter/bin/jitter-config.in | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in
|
||||
index 5e124f0..af0ac9d 100644
|
||||
--- a/jitter/bin/jitter-config.in
|
||||
+++ b/jitter/bin/jitter-config.in
|
||||
@@ -998,11 +998,7 @@ while test "$#" != "0"; do
|
||||
append_to_output cflags;;
|
||||
--cppflags)
|
||||
no_option_argument
|
||||
- append_to_output cppflags
|
||||
- # Append a -I argument. This is defined separately from the rest,
|
||||
- # as the installation prefix can be decided very late, at Jitter
|
||||
- # installation time.
|
||||
- output="$output -I $includedir";;
|
||||
+ append_to_output cppflags;;
|
||||
--ldadd)
|
||||
no_option_argument
|
||||
append_to_output ldadd;;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -11,18 +11,16 @@ Avoid:
|
|||
./../poke/poke -o ./poke.1
|
||||
../run: line 51: exec: :: not found
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c2f0760a..93769ef9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
|
||||
@@ -148,7 +148,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
|
||||
if test $cross_compiling = no; then
|
||||
AM_MISSING_PROG(HELP2MAN, help2man)
|
||||
else
|
||||
|
|
@ -30,7 +28,4 @@ index c2f0760a..93769ef9 100644
|
|||
+ HELP2MAN=true
|
||||
fi
|
||||
|
||||
dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to
|
||||
--
|
||||
2.30.2
|
||||
|
||||
dnl The following Automake conditional is used in some Makefile.am files
|
||||
|
|
|
|||
|
|
@ -6,14 +6,12 @@ LICENSE = "GPL-3.0-or-later"
|
|||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \
|
||||
file://0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch \
|
||||
file://0002-jitter-jitter-config.in-avoit-host-poisoning-while-c.patch \
|
||||
file://0003-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch \
|
||||
"
|
||||
|
||||
DEPENDS = "flex-native bison-native bdwgc readline"
|
||||
|
||||
SRC_URI[sha256sum] = "f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62"
|
||||
SRC_URI[sha256sum] = "02bab22cb1fa6153a1b6a927c8bb3cd58d508543c144842a6d7ee74f19973a77"
|
||||
|
||||
# poke does not support using out-of-tree builds
|
||||
inherit autotools-brokensep gettext pkgconfig
|
||||
|
|
@ -29,4 +27,7 @@ EXTRA_OECONF = "--disable-gui \
|
|||
|
||||
PACKAGECONFIG[mi] = "--enable-mi,--disable-mi,json-c"
|
||||
|
||||
FILES:${PN} += "${datadir}/emacs/site-lisp"
|
||||
PACKAGES =+ "${PN}-emacs ${PN}-vim"
|
||||
|
||||
FILES:${PN}-emacs += "${datadir}/emacs/site-lisp"
|
||||
FILES:${PN}-vim += "${datadir}/vim/vimfiles"
|
||||
Loading…
Reference in New Issue
Block a user