diff options
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch | 25 | ||||
-rw-r--r-- | meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb (renamed from meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb) | 3 |
2 files changed, 15 insertions, 13 deletions
diff --git a/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch index d98559b4ef..cb66adba9c 100644 --- a/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch +++ b/meta-networking/recipes-support/libtevent/libtevent/0001-Add-configure-options-for-packages.patch | |||
@@ -21,13 +21,16 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> | |||
21 | 21 | ||
22 | Update patch to version 0.10.0 | 22 | Update patch to version 0.10.0 |
23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 23 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
24 | |||
25 | Update patch to version 0.14.1 | ||
26 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
24 | --- | 27 | --- |
25 | lib/replace/wscript | 87 ++++++++++++++++++++++++++++++++++----------- | 28 | lib/replace/wscript | 85 +++++++++++++++++++++++++++++++++++---------- |
26 | wscript | 6 ++++ | 29 | wscript | 6 ++++ |
27 | 2 files changed, 73 insertions(+), 20 deletions(-) | 30 | 2 files changed, 73 insertions(+), 18 deletions(-) |
28 | 31 | ||
29 | diff --git a/lib/replace/wscript b/lib/replace/wscript | 32 | diff --git a/lib/replace/wscript b/lib/replace/wscript |
30 | index 4c774d9..21a746a 100644 | 33 | index 5c2b750..28835ac 100644 |
31 | --- a/lib/replace/wscript | 34 | --- a/lib/replace/wscript |
32 | +++ b/lib/replace/wscript | 35 | +++ b/lib/replace/wscript |
33 | @@ -25,6 +25,41 @@ def options(opt): | 36 | @@ -25,6 +25,41 @@ def options(opt): |
@@ -72,7 +75,7 @@ index 4c774d9..21a746a 100644 | |||
72 | @Utils.run_once | 75 | @Utils.run_once |
73 | def configure(conf): | 76 | def configure(conf): |
74 | conf.RECURSE('buildtools/wafsamba') | 77 | conf.RECURSE('buildtools/wafsamba') |
75 | @@ -35,12 +70,25 @@ def configure(conf): | 78 | @@ -38,12 +73,27 @@ def configure(conf): |
76 | conf.DEFINE('HAVE_LIBREPLACE', 1) | 79 | conf.DEFINE('HAVE_LIBREPLACE', 1) |
77 | conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) | 80 | conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) |
78 | 81 | ||
@@ -82,8 +85,8 @@ index 4c774d9..21a746a 100644 | |||
82 | + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') | 85 | + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') |
83 | conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') | 86 | conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') |
84 | conf.CHECK_HEADERS('locale.h ndir.h pwd.h') | 87 | conf.CHECK_HEADERS('locale.h ndir.h pwd.h') |
85 | - conf.CHECK_HEADERS('shadow.h sys/acl.h') | 88 | conf.CHECK_HEADERS('shadow.h sys/acl.h') |
86 | - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') | 89 | conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') |
87 | + conf.CHECK_HEADERS('shadow.h') | 90 | + conf.CHECK_HEADERS('shadow.h') |
88 | + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') | 91 | + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') |
89 | + | 92 | + |
@@ -99,10 +102,10 @@ index 4c774d9..21a746a 100644 | |||
99 | + if Options.options.enable_libcap: | 102 | + if Options.options.enable_libcap: |
100 | + conf.CHECK_HEADERS('sys/capability.h') | 103 | + conf.CHECK_HEADERS('sys/capability.h') |
101 | + | 104 | + |
102 | conf.CHECK_HEADERS('port.h') | ||
103 | conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') | 105 | conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') |
104 | conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') | 106 | conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') |
105 | @@ -110,8 +158,9 @@ def configure(conf): | 107 | conf.CHECK_HEADERS('sys/resource.h sys/security.h sys/shm.h sys/statfs.h sys/statvfs.h sys/termio.h') |
108 | @@ -113,8 +163,9 @@ def configure(conf): | ||
106 | conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') | 109 | conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') |
107 | conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') | 110 | conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') |
108 | 111 | ||
@@ -114,7 +117,7 @@ index 4c774d9..21a746a 100644 | |||
114 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') | 117 | conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') |
115 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') | 118 | conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') |
116 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') | 119 | conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') |
117 | @@ -434,20 +483,18 @@ def configure(conf): | 120 | @@ -436,20 +487,18 @@ def configure(conf): |
118 | 121 | ||
119 | strlcpy_in_bsd = False | 122 | strlcpy_in_bsd = False |
120 | 123 | ||
@@ -148,7 +151,7 @@ index 4c774d9..21a746a 100644 | |||
148 | conf.CHECK_CODE(''' | 151 | conf.CHECK_CODE(''' |
149 | struct ucred cred; | 152 | struct ucred cred; |
150 | diff --git a/wscript b/wscript | 153 | diff --git a/wscript b/wscript |
151 | index 5c6f02c..75eecd4 100644 | 154 | index 0f6e92f..5a54f3a 100644 |
152 | --- a/wscript | 155 | --- a/wscript |
153 | +++ b/wscript | 156 | +++ b/wscript |
154 | @@ -28,6 +28,12 @@ def options(opt): | 157 | @@ -28,6 +28,12 @@ def options(opt): |
@@ -165,5 +168,5 @@ index 5c6f02c..75eecd4 100644 | |||
165 | def configure(conf): | 168 | def configure(conf): |
166 | conf.RECURSE('lib/replace') | 169 | conf.RECURSE('lib/replace') |
167 | -- | 170 | -- |
168 | 2.25.1 | 171 | 2.34.1 |
169 | 172 | ||
diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb index 0d898be82e..b34c186ca5 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.13.0.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.14.1.bb | |||
@@ -17,8 +17,7 @@ SRC_URI:append:libc-musl = " file://cmocka-fix-musl-libc-conflicting-types-error | |||
17 | 17 | ||
18 | LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" | 18 | LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=47386b7c539bf2706b7ce52dc9341681" |
19 | 19 | ||
20 | SRC_URI[md5sum] = "9f413f3184f79a4deecd9444242a5dca" | 20 | SRC_URI[sha256sum] = "ef85fcaa80ffd2351036ba4b347630fef2a1ac3da964a7f1820466bad03cd00d" |
21 | SRC_URI[sha256sum] = "b9437a917fa55344361beb64ec9e0042e99cae8879882a62dd38f6abe2371d0c" | ||
22 | 21 | ||
23 | inherit pkgconfig ptest waf-samba | 22 | inherit pkgconfig ptest waf-samba |
24 | 23 | ||