* [meta-oe][PATCH 1/4] neon: Upgrade to 0.32.2
@ 2022-08-25 0:03 Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 2/4] libb64: Switch to github fork and upgrade to 2.0.0.1+git Khem Raj
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Khem Raj @ 2022-08-25 0:03 UTC (permalink / raw
To: openembedded-devel; +Cc: Khem Raj
Drop libxml2-config patch, its not needed anymore
Do not install documentation, it does not cross build
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...001-Disable-installing-documentation.patch | 28 +++++++++++
.../neon/fix-package-check-for-libxml2.patch | 50 -------------------
.../neon/{neon_0.30.2.bb => neon_0.32.2.bb} | 15 +++---
3 files changed, 37 insertions(+), 56 deletions(-)
create mode 100644 meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch
delete mode 100644 meta-oe/recipes-support/neon/neon/fix-package-check-for-libxml2.patch
rename meta-oe/recipes-support/neon/{neon_0.30.2.bb => neon_0.32.2.bb} (82%)
diff --git a/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch
new file mode 100644
index 0000000000..1f63df27ac
--- /dev/null
+++ b/meta-oe/recipes-support/neon/neon/0001-Disable-installing-documentation.patch
@@ -0,0 +1,28 @@
+From f477408f1c24ce6e5589e5a99d369279916c7c6e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 24 Aug 2022 13:11:12 -0700
+Subject: [PATCH] Disable installing documentation
+
+It does not build
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ed87a69..c32405c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -125,7 +125,7 @@ Makefile: $(srcdir)/Makefile.in
+ neon-config: $(srcdir)/neon-config.in
+ @./config.status neon-config
+
+-install-docs: install-man install-html
++install-docs:
+
+ install-html:
+ $(INSTALL) -d $(DESTDIR)$(docdir)/html
+--
+2.37.2
+
diff --git a/meta-oe/recipes-support/neon/neon/fix-package-check-for-libxml2.patch b/meta-oe/recipes-support/neon/neon/fix-package-check-for-libxml2.patch
deleted file mode 100644
index 92a05c0ef9..0000000000
--- a/meta-oe/recipes-support/neon/neon/fix-package-check-for-libxml2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-neon: Change the neon configure to use pkg-config instead of xml2-config
-
-xml2-config is broken for neon
-if packageconfig libxml2, webdav, zlib is enabled for neon
-we get the following configure error in the yocto build
-
-| configure: WebDAV support is enabled
-| checking for xml2-config... xml2-config
-| ERROR: /usr/bin/xml2-config should not be used, use an alternative such as pkg-config
-| ERROR: /usr/bin/xml2-config should not be used, use an alternative such as pkg-config
-| ERROR: /usr/bin/xml2-config should not be used, use an alternative such as pkg-config
-| checking libxml/xmlversion.h usability... no
-| checking libxml/xmlversion.h presence... no
-| checking for libxml/xmlversion.h... no
-| configure: error: could not find parser.h, libxml installation problem?
-| WARNING: exit code 1 from a shell command.
-
-The patch lets configure use pkg-config
-
-Upstream-Status: inappropriate
-(Upstream suggests to use latest 0.31 as per the discussion
-https://github.com/notroj/neon/discussions/47)
-
-Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
---- a/macros/neon-xml-parser.m4 2008-07-19 23:52:35.000000000 +0200
-+++ b/macros/neon-xml-parser.m4 2021-02-15 23:56:59.202751257 +0100
-@@ -44,17 +44,17 @@
-
- dnl Find libxml2: run $1 if found, else $2
- AC_DEFUN([NE_XML_LIBXML2], [
--AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
-+AC_CHECK_PROG(XML2_CONFIG, pkg-config, pkg-config)
- if test -n "$XML2_CONFIG"; then
-- neon_xml_parser_message="libxml `$XML2_CONFIG --version`"
- AC_DEFINE(HAVE_LIBXML, 1, [Define if you have libxml])
-- # xml2-config in some versions erroneously includes -I/include
-- # in the --cflags output.
-- CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`"
-- NEON_LIBS="$NEON_LIBS `$XML2_CONFIG --libs | sed 's|-L/usr/lib ||g'`"
-+ PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.4)
-+ AC_MSG_NOTICE([libxmlfound CFlags : , ${XML_CFLAGS}])
-+ CPPFLAGS="$CPPFLAGS ${XML_CFLAGS}"
-+ NEON_LIBS="$NEON_LIBS ${XML_LIBS}"
- AC_CHECK_HEADERS(libxml/xmlversion.h libxml/parser.h,,[
- AC_MSG_ERROR([could not find parser.h, libxml installation problem?])])
- neon_xml_parser=libxml2
-+ neon_xml_parser_message="libxml2"
- else
- $1
- fi
diff --git a/meta-oe/recipes-support/neon/neon_0.30.2.bb b/meta-oe/recipes-support/neon/neon_0.32.2.bb
similarity index 82%
rename from meta-oe/recipes-support/neon/neon_0.30.2.bb
rename to meta-oe/recipes-support/neon/neon_0.32.2.bb
index 646a9eca13..78f48a387d 100644
--- a/meta-oe/recipes-support/neon/neon_0.30.2.bb
+++ b/meta-oe/recipes-support/neon/neon_0.32.2.bb
@@ -3,16 +3,15 @@ HOMEPAGE = "http://www.webdav.org/neon/"
SECTION = "libs"
LICENSE = "LGPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
- file://src/ne_utils.h;beginline=1;endline=20;md5=2caca609538eddaa6f6adf120a218037"
+ file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133"
SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
file://pkgconfig.patch \
- file://fix-package-check-for-libxml2.patch \
+ file://0001-Disable-installing-documentation.patch \
file://run-ptest \
- "
+ "
-SRC_URI[md5sum] = "e28d77bf14032d7f5046b3930704ef41"
-SRC_URI[sha256sum] = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"
+SRC_URI[sha256sum] = "7a25ba2c9223676b9aaec22a585a0ca118127bad71deed0b9ed6cd960fe5c353"
inherit autotools binconfig-disabled lib_package pkgconfig ptest
@@ -29,7 +28,11 @@ PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
-EXTRA_OECONF += "--enable-shared"
+EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix --disable-nls"
+
+do_configure:prepend() {
+ echo "${PV}" > ${S}/.version
+}
do_compile:append() {
oe_runmake -C test
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe][PATCH 2/4] libb64: Switch to github fork and upgrade to 2.0.0.1+git
2022-08-25 0:03 [meta-oe][PATCH 1/4] neon: Upgrade to 0.32.2 Khem Raj
@ 2022-08-25 0:03 ` Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 3/4] dhrystone: Disable warnings as errors with clang Khem Raj
2022-08-25 0:03 ` [meta-networking][PATCH 4/4] dibbler: Fix build with musl Khem Raj
2 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2022-08-25 0:03 UTC (permalink / raw
To: openembedded-devel; +Cc: Khem Raj
Many of the patches floating around has been applied to github fork and
seems to be having recent releases.
Drop patches which are either applied or fixed differently in this
version
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...efile-fix-parallel-build-of-examples.patch | 46 +++++++++++
...e-proper-function-prototype-for-main.patch | 27 +++++++
.../0002-use-BUFSIZ-as-buffer-size.patch | 57 --------------
.../libb64/0003-fix-integer-overflows.patch | 77 -------------------
.../libb64/0004-Fix-off-by-one-error.patch | 26 -------
...0005-make-overriding-CFLAGS-possible.patch | 40 ----------
...t-export-the-CHARS_PER_LINE-variable.patch | 27 -------
...er-decoder-state-in-the-constructors.patch | 44 -----------
.../{libb64_1.2.1.bb => libb64_2.0.0.1.bb} | 20 +++--
9 files changed, 82 insertions(+), 282 deletions(-)
create mode 100644 meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch
create mode 100644 meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch
delete mode 100644 meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch
delete mode 100644 meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch
delete mode 100644 meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch
delete mode 100644 meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch
delete mode 100644 meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch
delete mode 100644 meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch
rename meta-oe/recipes-support/libb64/{libb64_1.2.1.bb => libb64_2.0.0.1.bb} (54%)
diff --git a/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch
new file mode 100644
index 0000000000..84dee415ad
--- /dev/null
+++ b/meta-oe/recipes-support/libb64/libb64/0001-Makefile-fix-parallel-build-of-examples.patch
@@ -0,0 +1,46 @@
+From cbe8bd2948f522062c6170f581e1e265692a9a55 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Sun, 24 Oct 2021 18:53:04 +0100
+Subject: [PATCH] Makefile: fix parallel build of examples
+
+Without the change examples fails to build as:
+
+ $ LANG=C make -j
+ make -C src
+ make -C examples
+ make[1]: Entering directory 'libb64/src'
+ cc -O3 -Werror -pedantic -I../include -c -o cencode.o cencode.c
+ make[1]: Entering directory 'libb64/examples'
+ make[1]: *** No rule to make target 'libb64.a', needed by 'c-example1'. Stop.
+ make[1]: Leaving directory 'libb64/examples'
+ make: *** [Makefile:8: all_examples] Error 2
+ make: *** Waiting for unfinished jobs....
+ cc -O3 -Werror -pedantic -I../include -c -o cdecode.o cdecode.c
+ ar rv libb64.a cencode.o cdecode.o
+ ar: creating libb64.a
+ a - cencode.o
+ a - cdecode.o
+ make[1]: Leaving directory 'libb64/src'
+
+Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/9]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index db40356..aa48c76 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ all_src:
+ $(MAKE) -C src
+ all_base64: all_src
+ $(MAKE) -C base64
+-all_examples:
++all_examples: all_src
+ $(MAKE) -C examples
+
+ clean: clean_src clean_base64 clean_include clean_examples
+--
+2.37.2
+
diff --git a/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch
new file mode 100644
index 0000000000..42e889efc2
--- /dev/null
+++ b/meta-oe/recipes-support/libb64/libb64/0001-examples-Use-proper-function-prototype-for-main.patch
@@ -0,0 +1,27 @@
+From 98eaf510f40e384b32c01ad4bd5c3a697fdd8560 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 24 Aug 2022 14:34:38 -0700
+Subject: [PATCH] examples: Use proper function prototype for main
+
+Upstream-Status: Submitted [https://github.com/libb64/libb64/pull/10]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ examples/c-example1.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/c-example1.c b/examples/c-example1.c
+index a0001df..34585dd 100644
+--- a/examples/c-example1.c
++++ b/examples/c-example1.c
+@@ -83,7 +83,7 @@ char* decode(const char* input)
+ }
+
+
+-int main()
++int main(int argc, char** argv)
+ {
+ const char* input = "hello world";
+ char* encoded;
+--
+2.37.2
+
diff --git a/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch b/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch
deleted file mode 100644
index 10ec8e14a8..0000000000
--- a/meta-oe/recipes-support/libb64/libb64/0002-use-BUFSIZ-as-buffer-size.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ee03e265804a07a0da5028b86960031bd7ab86b2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Mar 2021 22:01:13 -0700
-Subject: [PATCH] use BUFSIZ as buffer size
-
-Author: Jakub Wilk <jwilk@debian.org>
-Bug: http://sourceforge.net/tracker/?func=detail&atid=785907&aid=3591336&group_id=152942
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/b64/decode.h | 3 ++-
- include/b64/encode.h | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/b64/decode.h b/include/b64/decode.h
-index 12b16ea..e9019f3 100644
---- a/include/b64/decode.h
-+++ b/include/b64/decode.h
-@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64
- #ifndef BASE64_DECODE_H
- #define BASE64_DECODE_H
-
-+#include <cstdio>
- #include <iostream>
-
- namespace base64
-@@ -22,7 +23,7 @@ namespace base64
- base64_decodestate _state;
- int _buffersize;
-
-- decoder(int buffersize_in = BUFFERSIZE)
-+ decoder(int buffersize_in = BUFSIZ)
- : _buffersize(buffersize_in)
- {}
-
-diff --git a/include/b64/encode.h b/include/b64/encode.h
-index 5d807d9..e7a7035 100644
---- a/include/b64/encode.h
-+++ b/include/b64/encode.h
-@@ -8,6 +8,7 @@ For details, see http://sourceforge.net/projects/libb64
- #ifndef BASE64_ENCODE_H
- #define BASE64_ENCODE_H
-
-+#include <cstdio>
- #include <iostream>
-
- namespace base64
-@@ -22,7 +23,7 @@ namespace base64
- base64_encodestate _state;
- int _buffersize;
-
-- encoder(int buffersize_in = BUFFERSIZE)
-+ encoder(int buffersize_in = BUFSIZ)
- : _buffersize(buffersize_in)
- {}
-
diff --git a/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch b/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch
deleted file mode 100644
index 8854bb6af4..0000000000
--- a/meta-oe/recipes-support/libb64/libb64/0003-fix-integer-overflows.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 7b30fbc3d47dfaf38d8ce8b8949a69d2984dac76 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Mar 2021 22:06:03 -0700
-Subject: [PATCH] fix integer overflows
-
-Author: Jakub Wilk <jwilk@debian.org>
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3591129&group_id=152942&atid=785907
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/cdecode.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/cdecode.c b/src/cdecode.c
-index a6c0a42..4e47e9f 100644
---- a/src/cdecode.c
-+++ b/src/cdecode.c
-@@ -9,10 +9,11 @@ For details, see http://sourceforge.net/projects/libb64
-
- int base64_decode_value(char value_in)
- {
-- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
-+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51};
- static const char decoding_size = sizeof(decoding);
-+ if (value_in < 43) return -1;
- value_in -= 43;
-- if (value_in < 0 || value_in >= decoding_size) return -1;
-+ if (value_in > decoding_size) return -1;
- return decoding[(int)value_in];
- }
-
-@@ -26,7 +27,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
- {
- const char* codechar = code_in;
- char* plainchar = plaintext_out;
-- char fragment;
-+ int fragment;
-
- *plainchar = state_in->plainchar;
-
-@@ -42,7 +43,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
- state_in->plainchar = *plainchar;
- return plainchar - plaintext_out;
- }
-- fragment = (char)base64_decode_value(*codechar++);
-+ fragment = base64_decode_value(*codechar++);
- } while (fragment < 0);
- *plainchar = (fragment & 0x03f) << 2;
- case step_b:
-@@ -53,7 +54,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
- state_in->plainchar = *plainchar;
- return plainchar - plaintext_out;
- }
-- fragment = (char)base64_decode_value(*codechar++);
-+ fragment = base64_decode_value(*codechar++);
- } while (fragment < 0);
- *plainchar++ |= (fragment & 0x030) >> 4;
- *plainchar = (fragment & 0x00f) << 4;
-@@ -65,7 +66,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
- state_in->plainchar = *plainchar;
- return plainchar - plaintext_out;
- }
-- fragment = (char)base64_decode_value(*codechar++);
-+ fragment = base64_decode_value(*codechar++);
- } while (fragment < 0);
- *plainchar++ |= (fragment & 0x03c) >> 2;
- *plainchar = (fragment & 0x003) << 6;
-@@ -77,7 +78,7 @@ int base64_decode_block(const char* code_in, const int length_in, char* plaintex
- state_in->plainchar = *plainchar;
- return plainchar - plaintext_out;
- }
-- fragment = (char)base64_decode_value(*codechar++);
-+ fragment = base64_decode_value(*codechar++);
- } while (fragment < 0);
- *plainchar++ |= (fragment & 0x03f);
- }
diff --git a/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch b/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch
deleted file mode 100644
index e19dbad08d..0000000000
--- a/meta-oe/recipes-support/libb64/libb64/0004-Fix-off-by-one-error.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8144fd9e02bd5ccd1e080297b19a1e9eb4d3ff96 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Mar 2021 22:07:15 -0700
-Subject: [PATCH] Fix off by one error
-
-Launchpad bug #1501176 reported by William McCall on 2015-09-30
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/cdecode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cdecode.c b/src/cdecode.c
-index 4e47e9f..45da4e1 100644
---- a/src/cdecode.c
-+++ b/src/cdecode.c
-@@ -13,7 +13,7 @@ int base64_decode_value(char value_in)
- static const char decoding_size = sizeof(decoding);
- if (value_in < 43) return -1;
- value_in -= 43;
-- if (value_in > decoding_size) return -1;
-+ if (value_in >= decoding_size) return -1;
- return decoding[(int)value_in];
- }
-
diff --git a/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch b/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch
deleted file mode 100644
index e93015ee48..0000000000
--- a/meta-oe/recipes-support/libb64/libb64/0005-make-overriding-CFLAGS-possible.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a7914d5ffee6ffdfb3f2b8ebcc22c8367d078301 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Mar 2021 22:08:43 -0700
-Subject: [PATCH] make overriding CFLAGS possible
-
-Author: Jakub Wilk <jwilk@debian.org>
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- base64/Makefile | 2 +-
- src/Makefile | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/base64/Makefile b/base64/Makefile
-index 30a2c5c..783a248 100644
---- a/base64/Makefile
-+++ b/base64/Makefile
-@@ -3,7 +3,7 @@ BINARIES = base64
- # Build flags (uncomment one)
- #############################
- # Release build flags
--CFLAGS += -O3
-+CFLAGS ?= -O3
- #############################
- # Debug build flags
- #CFLAGS += -g
-diff --git a/src/Makefile b/src/Makefile
-index 28b2382..48801fc 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,7 +3,7 @@ LIBRARIES = libb64.a
- # Build flags (uncomment one)
- #############################
- # Release build flags
--CFLAGS += -O3
-+CFLAGS ?= -O3
- #############################
- # Debug build flags
- #CFLAGS += -g
diff --git a/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch b/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch
deleted file mode 100644
index 9ba08c87ee..0000000000
--- a/meta-oe/recipes-support/libb64/libb64/0006-do-not-export-the-CHARS_PER_LINE-variable.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a1b9bb4af819ed389675f16e4a521efeda4cc3f3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Mar 2021 22:10:48 -0700
-Subject: [PATCH] do not export the CHARS_PER_LINE variable
-
-The library exports a variable named "CHARS_PER_LINE". This is a generic name that could conflict with a name in user's code.
-Please either rename the variable or make it static.
-
-Upstream-Status: Submitted [http://sourceforge.net/tracker/?func=detail&aid=3591420&group_id=152942&atid=785907]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/cencode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cencode.c b/src/cencode.c
-index 03ba5b6..3df62a8 100644
---- a/src/cencode.c
-+++ b/src/cencode.c
-@@ -7,7 +7,7 @@ For details, see http://sourceforge.net/projects/libb64
-
- #include <b64/cencode.h>
-
--const int CHARS_PER_LINE = 72;
-+static const int CHARS_PER_LINE = 72;
-
- void base64_init_encodestate(base64_encodestate* state_in)
- {
diff --git a/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch b/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch
deleted file mode 100644
index fdf8339bed..0000000000
--- a/meta-oe/recipes-support/libb64/libb64/0007-initialize-encoder-decoder-state-in-the-constructors.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c1ba44d83cc7d9d756cfb063717852eae9d03328 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 27 Mar 2021 22:12:41 -0700
-Subject: [PATCH] initialize encoder/decoder state in the constructors
-
-Author: Jakub Wilk <jwilk@debian.org>
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/b64/decode.h | 4 +++-
- include/b64/encode.h | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/include/b64/decode.h b/include/b64/decode.h
-index e9019f3..aefb7bc 100644
---- a/include/b64/decode.h
-+++ b/include/b64/decode.h
-@@ -25,7 +25,9 @@ namespace base64
-
- decoder(int buffersize_in = BUFSIZ)
- : _buffersize(buffersize_in)
-- {}
-+ {
-+ base64_init_decodestate(&_state);
-+ }
-
- int decode(char value_in)
- {
-diff --git a/include/b64/encode.h b/include/b64/encode.h
-index e7a7035..33848b3 100644
---- a/include/b64/encode.h
-+++ b/include/b64/encode.h
-@@ -25,7 +25,9 @@ namespace base64
-
- encoder(int buffersize_in = BUFSIZ)
- : _buffersize(buffersize_in)
-- {}
-+ {
-+ base64_init_encodestate(&_state);
-+ }
-
- int encode(char value_in)
- {
diff --git a/meta-oe/recipes-support/libb64/libb64_1.2.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
similarity index 54%
rename from meta-oe/recipes-support/libb64/libb64_1.2.1.bb
rename to meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
index 64a34fece7..8122419c5e 100644
--- a/meta-oe/recipes-support/libb64/libb64_1.2.1.bb
+++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
@@ -2,22 +2,20 @@ SUMMARY = "Base64 Encoding/Decoding Routines"
DESCRIPTION = "base64 encoding/decoding library - runtime library \
libb64 is a library of ANSI C routines for fast encoding/decoding data into \
and from a base64-encoded format"
-HOMEPAGE = "http://libb64.sourceforge.net/"
+HOMEPAGE = "https://github.com/libb64"
LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ce551aad762074c7ab618a0e07a8dca3"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=81296a564fa0621472714aae7c763d96"
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${BP}.zip \
+PV .= "+2.0.0.2+git${SRCPV}"
+SRCREV = "ce864b17ea0e24a91e77c7dd3eb2d1ac4175b3f0"
+
+SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \
file://0001-example-Do-not-run-the-tests.patch \
- file://0002-use-BUFSIZ-as-buffer-size.patch \
- file://0003-fix-integer-overflows.patch \
- file://0004-Fix-off-by-one-error.patch \
- file://0005-make-overriding-CFLAGS-possible.patch \
- file://0006-do-not-export-the-CHARS_PER_LINE-variable.patch \
- file://0007-initialize-encoder-decoder-state-in-the-constructors.patch \
+ file://0001-Makefile-fix-parallel-build-of-examples.patch \
+ file://0001-examples-Use-proper-function-prototype-for-main.patch \
"
-SRC_URI[sha256sum] = "20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2"
-PARALLEL_MAKE = ""
+S = "${WORKDIR}/git"
CFLAGS += "-fPIC"
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe][PATCH 3/4] dhrystone: Disable warnings as errors with clang
2022-08-25 0:03 [meta-oe][PATCH 1/4] neon: Upgrade to 0.32.2 Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 2/4] libb64: Switch to github fork and upgrade to 2.0.0.1+git Khem Raj
@ 2022-08-25 0:03 ` Khem Raj
2022-08-25 0:03 ` [meta-networking][PATCH 4/4] dibbler: Fix build with musl Khem Raj
2 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2022-08-25 0:03 UTC (permalink / raw
To: openembedded-devel; +Cc: Khem Raj
The sourcecode predate C99 and newer compiler are becoming string about
language syntax and standards compliance,so this starts to fail builds
due to additional warnings which are being promoted to errors. The
objective of this package is measuring performance so we can ignore
compiler warnings as errors
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
index 17e8c700ca..d809a564e9 100644
--- a/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
+++ b/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb
@@ -22,5 +22,6 @@ do_install() {
# Prevent procedure merging as required by dhrystone.c:
CFLAGS += "-fno-lto"
+CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration -Wno-error=deprecated-non-prototype -Wno-error=implicit-int"
LDFLAGS += "-fno-lto"
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-networking][PATCH 4/4] dibbler: Fix build with musl
2022-08-25 0:03 [meta-oe][PATCH 1/4] neon: Upgrade to 0.32.2 Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 2/4] libb64: Switch to github fork and upgrade to 2.0.0.1+git Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 3/4] dhrystone: Disable warnings as errors with clang Khem Raj
@ 2022-08-25 0:03 ` Khem Raj
2 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2022-08-25 0:03 UTC (permalink / raw
To: openembedded-devel; +Cc: Khem Raj
Use _GNU_SOURCE to compile which helps fixing build with musl
add a header reordering patch to again fix another issue with musl
builds
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
| 33 +++++++++++++++++++
.../dibbler/dibbler_git.bb | 2 ++
2 files changed, 35 insertions(+)
create mode 100644 meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch
--git a/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch
new file mode 100644
index 0000000000..27a562bf22
--- /dev/null
+++ b/meta-networking/recipes-connectivity/dibbler/dibbler/0001-port-linux-Re-order-header-includes.patch
@@ -0,0 +1,33 @@
+From cbb33e1548fe526c3e7dead294617bde1f087ae3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 24 Aug 2022 16:40:38 -0700
+Subject: [PATCH] port-linux: Re-order header includes
+
+linux/if.h when included before net/if.h casues duplicate definitions
+
+Upstream-Status: Iappropriate [Upstream is Dead]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Port-linux/interface.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Port-linux/interface.c b/Port-linux/interface.c
+index 18777e91..19aefb2b 100644
+--- a/Port-linux/interface.c
++++ b/Port-linux/interface.c
+@@ -25,7 +25,6 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
+ #include <syslog.h>
+ #include <string.h>
+ #include <errno.h>
+@@ -42,6 +41,7 @@
+ #include <stdarg.h>
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
++#include <linux/if.h>
+
+ int interface_auto_up = 0;
+ int interface_do_message = 0;
diff --git a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
index bdda35a24b..f57767e9b8 100644
--- a/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
+++ b/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb
@@ -9,6 +9,7 @@ SRCREV = "a7c6cf58a88a510cb00841351e75030ce78d36bf"
SRC_URI = "git://github.com/tomaszmrugalski/dibbler;branch=master;protocol=https \
file://dibbler_fix_getSize_crash.patch \
+ file://0001-port-linux-Re-order-header-includes.patch \
"
PV = "1.0.1+1.0.2RC1+git${SRCREV}"
@@ -29,6 +30,7 @@ inherit autotools
DEPENDS += "flex-native"
+CFLAGS += "-D_GNU_SOURCE"
LDFLAGS += "-pthread"
PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server"
--
2.37.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-25 0:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-25 0:03 [meta-oe][PATCH 1/4] neon: Upgrade to 0.32.2 Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 2/4] libb64: Switch to github fork and upgrade to 2.0.0.1+git Khem Raj
2022-08-25 0:03 ` [meta-oe][PATCH 3/4] dhrystone: Disable warnings as errors with clang Khem Raj
2022-08-25 0:03 ` [meta-networking][PATCH 4/4] dibbler: Fix build with musl Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.