libedit: Move from meta-oe
PATCH 1/2 libedit: Move from meta-oe
libedit is needed by llvm on linux and this makes it useful for both oe-core and clang layer among other users
Thanks to various contributors in maintaing it in meta-oe
--- meta/conf/distro/include/maintainers.inc | 1 + .../libedit/libedit/stdc-predef.patch | 18 +++++++++++++++ .../libedit/libedit_20190324-3.1.bb | 23 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/libedit/libedit/stdc-predef.patch create mode 100644 meta/recipes-devtools/libedit/libedit_20190324-3.1.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -326,6 +326,7 @@ RECIPE_MAINTAINER_pn-libdazzle = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster <[email protected]>" RECIPE_MAINTAINER_pn-libdnf = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-libdrm = "Otavio Salvador <[email protected]>" +RECIPE_MAINTAINER_pn-libedit = "Khem Raj <[email protected]>" RECIPE_MAINTAINER_pn-libepoxy = "Anuj Mittal <[email protected]>" RECIPE_MAINTAINER_pn-liberation-fonts = "Alexander Kanavin <[email protected]>" RECIPE_MAINTAINER_pn-liberror-perl = "Tim Orling <[email protected]>"
meta/recipes-devtools/libedit/libedit/stdc-predef.patch new file +18 -0
@@ -0,0 +1,18 @@ +__STDC_ISO_10646__ is defined in stdc-predef.h +therefore include it to see if its there on a platform + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +Index: libedit-20160903-3.1/src/chartype.h +=================================================================== +--- libedit-20160903-3.1.orig/src/chartype.h ++++ libedit-20160903-3.1/src/chartype.h +@@ -29,6 +29,7 @@ + #ifndef _h_chartype_f + #define _h_chartype_f + ++#include <stdc-predef.h> + /* Ideally we should also test the value of the define to see if it + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having
meta/recipes-devtools/libedit/libedit_20190324-3.1.bb new file +23 -0
@@ -0,0 +1,23 @@ +SUMMARY = "BSD replacement for libreadline" +DESCRIPTION = "Command line editor library providing generic line editing, \ +history, and tokenization functions" +HOMEPAGE = "http://www.thrysoee.dk/editline/" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=1e4228d0c5a9093b01aeaaeae6641533" + +DEPENDS = "ncurses" + +inherit autotools + +# upstream site does not allow wget's User-Agent +FETCHCMD_wget += "-U bitbake" +SRC_URI = "http://www.thrysoee.dk/editline/${BP}.tar.gz \ + file://stdc-predef.patch \ + " +SRC_URI[md5sum] = "bec755c8044ad84b752dfe49a0b371d8" +SRC_URI[sha256sum] = "ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae" + +UPSTREAM_CHECK_REGEX = "libedit-(?P<pver>\d+(\.\d+)+)\.tar.gz" + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.22.0
PATCH 2/2 llvm: Update to 8.0.1
Add missing dependency on libedit
--- meta/recipes-devtools/llvm/llvm_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/llvm/llvm_git.bb +3 -3
@@ -8,7 +8,7 @@ SECTION = "devel" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648" -DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" +DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"
@@ -19,12 +19,12 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59" +SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" -PATCH_VERSION = "0" +PATCH_VERSION = "1" SOLIBVER = "1" PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
Signature · 1 line
2.22.0
Re: [PATCH 2/2] llvm: Update to 8.0.1
Quoted 24 lines · Khem Raj
Add missing dependency on libedit
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-devtools/llvm/llvm_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes- renamed from meta/recipes-devtools/llvm/llvm_git.bb +0
-0devtools/llvm/llvm_git.bb
index0067635c2b..6d3d69b9fb100644meta/recipes-devtools/llvm/llvm_git.bb +0
-0@@ -8,7 +8,7 @@ SECTION = "devel" LIC_FILES_CHKSUM ="file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
meta/recipes-devtools/llvm/llvm_git.bb +1
-1-DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" +DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"@@ -19,12 +19,12 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}"
meta/recipes-devtools/llvm/llvm_git.bb PROVIDES += "llvm${PV}" · line 27
Quoted 10 lines
meta/recipes-devtools/llvm/llvm_git.bb +2
-2LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59" +SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" -PATCH_VERSION = "0" +PATCH_VERSION = "1"
I had to tweak MESA_LLVM_RELEASE in the mesa recipe to match this change...
(squashed into this patch in -next)
Cheers,
Richard
Re: [PATCH 2/2] llvm: Update to 8.0.1
Thanks for taking care of this I noticed this failure last night as well
Quoted 46 lines · Richard Purdie
Quoted 24 lines · Khem Raj
Add missing dependency on libedit
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-devtools/llvm/llvm_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta/recipes- renamed from meta/recipes-devtools/llvm/llvm_git.bb +0
-0devtools/llvm/llvm_git.bb
index0067635c2b..6d3d69b9fb100644meta/recipes-devtools/llvm/llvm_git.bb +0
-0@@ -8,7 +8,7 @@ SECTION = "devel" LIC_FILES_CHKSUM ="file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
meta/recipes-devtools/llvm/llvm_git.bb +1
-1-DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" +DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"@@ -19,12 +19,12 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}"meta/recipes-devtools/llvm/llvm_git.bb PROVIDES += "llvm${PV}" · line 27
Quoted 10 lines
meta/recipes-devtools/llvm/llvm_git.bb +2
-2LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59" +SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" -PATCH_VERSION = "0" +PATCH_VERSION = "1"I had to tweak
MESA_LLVM_RELEASEin the mesa recipe to match this change...(squashed into this patch in -next)
Cheers,
Richard
Re: [PATCH 2/2] llvm: Update to 8.0.1
Quoted 46 lines · Khem Raj
Thanks for taking care of this I noticed this failure last night as well
Quoted 41 lines · Richard Purdie
Review
Quoted 8 lines · Khem Raj
Add missing dependency on libedit
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-devtools/llvm/llvm_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)(quoted diff) +0
-0b/meta/recipes-
Quoted 16 lines
devtools/llvm/llvm_git.bb
index0067635c2b..6d3d69b9fb100644meta/recipes-devtools/llvm/llvm_git.bb +0
-0@@ -8,7 +8,7 @@ SECTION = "devel" LIC_FILES_CHKSUM ="file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
meta/recipes-devtools/llvm/llvm_git.bb +1
-1-DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" +DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"@@ -19,12 +19,12 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}"meta/recipes-devtools/llvm/llvm_git.bb PROVIDES += "llvm${PV}" · line 27
Quoted 10 lines
meta/recipes-devtools/llvm/llvm_git.bb +2
-2LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59" +SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" -PATCH_VERSION = "0" +PATCH_VERSION = "1"I had to tweak
MESA_LLVM_RELEASEin the mesa recipe to match this change...(squashed into this patch in -next)
Unfortunately there is still something else wrong:
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/901
Cheers,
Richard
Re: [PATCH 2/2] llvm: Update to 8.0.1
Quoted 47 lines · On Sat, Aug 3, 2019 at 6:42 AM <[email protected]> wrote:
Quoted 45 lines · Khem Raj
Thanks for taking care of this I noticed this failure last night as well
Quoted 40 lines · Richard Purdie
Review
Quoted 8 lines · Khem Raj
Add missing dependency on libedit
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-devtools/llvm/llvm_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)(quoted diff) +0
-0b/meta/recipes-
Quoted 16 lines
devtools/llvm/llvm_git.bb
index0067635c2b..6d3d69b9fb100644meta/recipes-devtools/llvm/llvm_git.bb +0
-0@@ -8,7 +8,7 @@ SECTION = "devel" LIC_FILES_CHKSUM ="file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648"
meta/recipes-devtools/llvm/llvm_git.bb +1
-1-DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" +DEPENDS = "libffi libxml2 zlib libedit ninja-native llvm-native" RDEPENDS_${PN}_append_class-target = " ncurses-terminfo"@@ -19,12 +19,12 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}"meta/recipes-devtools/llvm/llvm_git.bb PROVIDES += "llvm${PV}" · line 27
Quoted 10 lines
meta/recipes-devtools/llvm/llvm_git.bb +2
-2LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "d2298e74235598f15594fe2c99bbac870a507c59" +SRCREV = "19a71f6bdf2dddb10764939e7f0ec2b98dba76c9" BRANCH = "release/${MAJOR_VERSION}.x" MAJOR_VERSION = "8" MINOR_VERSION = "0" -PATCH_VERSION = "0" +PATCH_VERSION = "1"I had to tweak
MESA_LLVM_RELEASEin the mesa recipe to match this change...
Quoted 6 lines
Quoted 1 line
Quoted 1 line
(squashed into this patch in -next)
Unfortunately there is still something else wrong:
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/901
something meson ... I wonder, I will see if I can reproduce it here on top of master-next
| llvm-config found: NO need '>= 7.0.0' | Run-time dependency LLVM found: NO (tried config-tool) | | meson.build:1253:2: ERROR: Dependency "llvm" not found, tried config-tool
Quoted 4 lines
Cheers,
Richard
Quoted 2 lines · Khem Raj
+UPSTREAM_CHECK_REGEX = "libedit-(?P<pver>\d+(\.\d+)+)\.tar.gz"
The recipe in meta-oe did not have this line. Where did you take it from and how did you test it? It is incorrect as it does not match anything with a dash (-) in it.
Simply dropping the line makes the version check work again.
Alex
Quoted 10 lines · Alexander Kanavin
Quoted 2 lines · Khem Raj
+UPSTREAM_CHECK_REGEX = "libedit-(?P<pver>\d+(\.\d+)+)\.tar.gz"
The recipe in meta-oe did not have this line. Where did you take it from and how did you test it? It is incorrect as it does not match anything with a dash (-) in it.
Simply dropping the line makes the version check work again.
Yes it was left over of some trying thanks for finding it I will send a patch
Quoted 3 lines
Alex