gnutls: add older gnutls compatible with nettle
PATCH 1/1 gnutls: add older gnutls compatible with nettle
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2
--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +31 -0
@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +
recipes-support/gnutls/gnutls_3.3.27.bb new file +23 -0
@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:" + +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f" + +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option] +PACKAGECONFIG[libidn] = "" +# but it has the dependency +DEPENDS += "libidn" + +# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix"
Signature · 1 line
2.12.2
Quoted 69 lines · Martin Jansa
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2Signed-off-by Martin Jansa <[email protected]>--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bbrecipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +31
-0@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +recipes-support/gnutls/gnutls_3.3.27.bb new file +10
-0@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:" + +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \
recipes-support/gnutls/gnutls_3.3.27.bb line 20
Quoted 10 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +10
-0+ file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f" + +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option] +PACKAGECONFIG[libidn] = "" +# but it has the dependency +DEPENDS += "libidn"
That dependency was removed for gnutls 3.3.x by:
http://git.openembedded.org/openembedded-core/commit/?id=6fd51f5c15a380eae630fe853ba0eccde7b9a369
Quoted 10 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-1+# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix" --2.12.2
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
I'll check the exact error message, but do_configure was failing for me when I did first build without this dependency.
Most likely because this option was removed with 3.5.1 upgrade in:
commit e8ef5912aac0104d9a47d6d10a95e64426d8840e
Author: Alexander Kanavin <[email protected]> Date: Tue Jun 28 11:06:16 2016 +0300
gnutls: update to 3.5.1
Remove no longer supported --disable-crywrap option. Add a checksum for the LICENSE file with licensing overview.
I've verified that even with this build dependency the main libgnutls package doesn't runtime depend on libidn, which is enough for us, if you have strong opinion about --disable-crywrap then we can return it in the recipes-support/gnutls/gnutls_3.3.27.bb
Quoted 112 lines · Andre McCurdy
Quoted 3 lines · Martin Jansa
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e5076327
71b0e76498Quoted 2 lines
and from 2.7 to 3.0 a bit earlier also in
gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba
463d6e731cQuoted 6 lines
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2
Signed-off-by Martin Jansa <[email protected]>--- .../gnutls/configure.ac-fix-sed-command.patch | 31++++++++++++++++++++++
Quoted 1 line
recipes-support/gnutls/gnutls_3.3.27.bb | 23++++++++++++++++
Quoted 2 lines
2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch
Review
Quoted 3 lines
create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb(quoted diff) +0
-0
b/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patchQuoted 16 lines
new file mode 100644
index 0000000..44a9934recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +11
-0@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]>recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch line 21
Quoted 10 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +10
-0+--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, ifpresent
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch line 23
Quoted 2 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +2
-0+ missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak;do
Review
Quoted 9 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +8
-0+- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +(quoted diff) +0
-0b/recipes-support/gnutls/gnutls_3.3.27.bb
recipes-support/gnutls/gnutls_3.3.27.bb line 3
Quoted 8 lines
new file mode 100644
index 0000000..2828581recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
recipes-support/gnutls/gnutls_3.3.27.bb line 4
Quoted 1 line
recipes-support/gnutls/gnutls_3.3.27.bb new file +1
-0+ file://COPYING.LESSER;md5=
a6f89e2100d9b6cdffcea4f398e37343"recipes-support/gnutls/gnutls_3.3.27.bb line 6
Quoted 2 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-0+ +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
recipes-support/gnutls/gnutls_3.3.27.bb
Quoted 8 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +8
-0+ +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d
02aa5d43b8cb711b1572650a7ffb56b17f"recipes-support/gnutls/gnutls_3.3.27.bb
Quoted 3 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0+ +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure waspassed unrecognised options: --with-idn [unknown-configure-option]
recipes-support/gnutls/gnutls_3.3.27.bb line 20
Quoted 3 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0+PACKAGECONFIG[libidn] = "" +# but it has the dependency +DEPENDS += "libidn"That dependency was removed for gnutls 3.3.x by:
http://git.openembedded.org/openembedded-core/commit/?id=
6fd51f5c15a380eae630fe853ba0eccde7b9a369Quoted 10 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-1+# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix" --2.12.2
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Quoted 8 lines · Martin Jansa
I'll check the exact error message, but
do_configurewas failing for me when I did first build without this dependency.Most likely because this option was removed with 3.5.1 upgrade in:
commite8ef5912aac0104d9a47d6d10a95e64426d8840eAuthor: Alexander Kanavin <[email protected]> Date: Tue Jun 28 11:06:16 2016 +0300
Quoted 8 lines
gnutls: update to 3.5.1
Remove no longer supported --disable-crywrap option. Add a checksum for the LICENSE file with licensing overview.
Signed-off-by Alexander Kanavin <[email protected]>Signed-off-by Ross Burton <[email protected]>
OK, that makes sense. I have my own gnutls_3.3.27.bb recipe and wasn't seeing the problem because I use a local gnutls.inc which still has that option.
Quoted 4 lines
I've verified that even with this build dependency the main libgnutls package doesn't runtime depend on libidn, which is enough for us, if you have strong opinion about --disable-crywrap then we can return it in the recipes-support/gnutls/gnutls_3.3.27.bb
Looking at configure.ac, I think restoring --disable-crywrap in gnutls_3.3.27.bb is the cleanest solution.
Quoted 117 lines · Andre McCurdy
Quoted 114 lines
Quoted 92 lines · Martin Jansa
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 ingnutls_3_4_0https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also ingnutls_3_4_0https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2Signed-off-by Martin Jansa <[email protected]>--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bbdiff --git
a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patchb/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patchnew file mode 100644
index 0000000..44a9934recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +6
-0@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strangeerrors
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +15
-0+when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, ifpresent
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +2
-0+ missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak;do
+- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'`recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +6
-0+ if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
+ file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-0+ +FILESEXTRAPATHS_prepend ="${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
recipes-support/gnutls/gnutls_3.3.27.bb new file +8
-0+ +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] ="
8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0+ +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure waspassed unrecognised options: --with-idn [unknown-configure-option]
recipes-support/gnutls/gnutls_3.3.27.bb line 20
Quoted 3 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0+PACKAGECONFIG[libidn] = "" +# but it has the dependency +DEPENDS += "libidn"That dependency was removed for gnutls 3.3.x by:
http://git.openembedded.org/openembedded-core/commit/?id=6fd51f5c15a380eae630fe853ba0eccde7b9a369
Quoted 10 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-1+# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix" --2.12.2
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Quoted 4 lines · Andre McCurdy
OK, that makes sense. I have my own gnutls_3.3.27.bb recipe and wasn't seeing the problem because I use a local gnutls.inc which still has that option.
Another example of why .inc files have to be trivial or very carefully maintained...
Yes, restoring the option seems like the best fix.
Ross
PATCH v2 1/1 gnutls: add older gnutls compatible with nettle
In reply to Martin Jansa* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also in gnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2
--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bb
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +31 -0
@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +
recipes-support/gnutls/gnutls_3.3.27.bb new file +23 -0
@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:" + +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f" + +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option] +PACKAGECONFIG[libidn] = "" +# but it still has the libidn dependency, without this option +EXTRA_OECONF += "--disable-crywrap" + +# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix"
Signature · 1 line
2.12.2
Quoted 37 lines · Martin Jansa
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2Signed-off-by Martin Jansa <[email protected]>--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bbrecipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +15
-0@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch line 25
Quoted 10 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +10
-0+diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'`
How about:
nam=basename $i .bak
Quoted 26 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +6
-0+ if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +recipes-support/gnutls/gnutls_3.3.27.bb new file +13
-0@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" + +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:" + +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3"
recipes-support/gnutls/gnutls_3.3.27.bb line 23
Quoted 10 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +10
-0+SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f" + +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure was passed unrecognised options: --with-idn [unknown-configure-option] +PACKAGECONFIG[libidn] = "" +# but it still has the libidn dependency, without this option +EXTRA_OECONF += "--disable-crywrap" + +# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix"
Kind regards,
Mike Looijmans
System Expert
TOPIC Products
Materiaalweg 4, NL-5681 RJ Best
Postbus 440, NL-5680 AK Best
Telefoon: +31 (0) 499 33 69 79
E-mail: [email protected]
Website: www.topicproducts.com
Please consider the environment before printing this e-mail
Quoted 51 lines · Mike Looijmans
Quoted 50 lines · Martin Jansa
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 ingnutls_3_4_0https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also ingnutls_3_4_0https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2Signed-off-by Martin Jansa <[email protected]>--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bbdiff --git
a/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patchb/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patchnew file mode 100644
index 0000000..44a9934recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +21
-0@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, if
Quoted 8 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch line 25
Quoted 5 lines
present
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +4
-0+ missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'`How about:
nam=basename $i .bak
This patch is a rebased version of the one in oe-core, so the oe-core version should probably be the first candidate for any such improvements.
Quoted 68 lines
Quoted 35 lines
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +6
-0+ if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +recipes-support/gnutls/gnutls_3.3.27.bb new file +4
-0@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +file://COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-0+ +FILESEXTRAPATHS_prepend ="${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
recipes-support/gnutls/gnutls_3.3.27.bb new file +8
-0+ +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] ="
8dfda16c158ef5c134010d51d1a91d02aa5d43b8cb711b1572650a7ffb56b17f"recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0+ +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure waspassed unrecognised options: --with-idn [unknown-configure-option]
recipes-support/gnutls/gnutls_3.3.27.bb line 23
Quoted 6 lines
recipes-support/gnutls/gnutls_3.3.27.bb new file +6
-0+PACKAGECONFIG[libidn] = "" +# but it still has the libidn dependency, without this option +EXTRA_OECONF += "--disable-crywrap" + +# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix"Kind regards,
Mike Looijmans
System ExpertTOPIC Products
Materiaalweg 4, NL-5681 RJ Best
Postbus 440, NL-5680 AK Best
Telefoon: +31 (0) 499 33 69 79
E-mail: [email protected]
Website: www.topicproducts.comPlease consider the environment before printing this e-mail
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
ping
This is needed in both pyro and master branches. And possibly in morty branch, but I haven't seen any replies about it in my RFC.
Quoted 97 lines · Martin Jansa
* gnutls depends on nettle-3.1* since 3.4.0:
The requirement for nettle was bumped from 3.0 to 3.1 ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/c84129af91b21d33ffe086e507632771b0e76498
and from 2.7 to 3.0 a bit earlier also ingnutls_3_4_0
https://gitlab.com/gnutls/gnutls/commit/3fa80cf68919f07b3351b2722278ba463d6e731c
* add recipe for last release in 3.3 branch which is compatible with nettle 2.7.1 used in meta-gplv2Signed-off-by Martin Jansa <[email protected]>--- .../gnutls/configure.ac-fix-sed-command.patch | 31 ++++++++++++++++++++++ recipes-support/gnutls/gnutls_3.3.27.bb | 23 ++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 recipes-support/gnutls/gnutls/ configure.ac-fix-sed-command.patch create mode 100644 recipes-support/gnutls/gnutls_3.3.27.bbrecipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +21
-0@@ -0,0 +1,31 @@ +From eb93aa7b986c84da60a3db40afb29d1a70c50223 Mon Sep 17 00:00:00 2001 +From: Robert Yang <[email protected]> +Date: Sat, 17 Jan 2015 17:02:15 +0000 +Subject: [PATCH] configure.ac: fix sed command + +The "sed 's/.bak//g'" matchs "bitbake", which would cause strange errors +when the S contains "bitbake", fix to "sed 's/\.bak$//'`" + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c6818a0..1c4582d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -466,7 +466,7 @@ if test "$NEED_LIBOPTS_DIR" = "true";then + dnl replace libopts-generated files with distributed backups, ifpresent
recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch new file +10
-0+ missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else +-- +2.0.1 +recipes-support/gnutls/gnutls_3.3.27.bb new file +4
-0@@ -0,0 +1,23 @@ +require recipes-support/gnutls/gnutls.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=
a6f89e2100d9b6cdffcea4f398e37343"recipes-support/gnutls/gnutls_3.3.27.bb new file +2
-0+ +FILESEXTRAPATHS_prepend = "${COREBASE}/meta/recipes-support/${BPN}/${BPN}:"
recipes-support/gnutls/gnutls_3.3.27.bb new file +8
-0+ +SRC_URI += " \ + file://correct_rpl_gettimeofday_signature.patch \ + file://configure.ac-fix-sed-command.patch \ + file://use-pkg-config-to-locate-zlib.patch \ +" +SRC_URI[md5sum] = "8ee8cebd7f7575b11f232766a21c31d3" +SRC_URI[sha256sum] = "8dfda16c158ef5c134010d51d1a91d
02aa5d43b8cb711b1572650a7ffb56b17f"recipes-support/gnutls/gnutls_3.3.27.bb new file +3
-0+ +# This version doesn't support this option added in newer gnutls +# ERROR: gnutls-3.3.27-r0 do_configure: QA Issue: gnutls: configure waspassed unrecognised options: --with-idn [unknown-configure-option]
recipes-support/gnutls/gnutls_3.3.27.bb new file +6
-1+PACKAGECONFIG[libidn] = "" +# but it still has the libidn dependency, without this option +EXTRA_OECONF += "--disable-crywrap" + +# This version doesn't support this option added in newer gnutls +EXTRA_OECONF_remove = "--without-libunistring-prefix" --2.12.2