diff options
Diffstat (limited to 'meta-oe/recipes-devtools')
28 files changed, 552 insertions, 55 deletions
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch new file mode 100644 index 000000000..461df7a60 --- /dev/null +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: aurel32 <aurelien@aurel32.net> | ||
3 | Date: Fri, 22 Mar 2024 14:21:13 -0700 | ||
4 | Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support | ||
5 | |||
6 | Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 | ||
7 | |||
8 | Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. | ||
9 | |||
10 | The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. | ||
11 | |||
12 | Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. | ||
13 | |||
14 | This fixes the testsuite on riscv64, tested on a VisionFive 2 board. | ||
15 | |||
16 | [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 | ||
17 | [2] https://github.com/abseil/abseil-cpp/pull/1631 | ||
18 | Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 | ||
19 | |||
20 | Merging this change closes #1644 | ||
21 | |||
22 | COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 | ||
23 | PiperOrigin-RevId: 618286262 | ||
24 | Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 | ||
25 | |||
26 | Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d] | ||
27 | [Adapted to apply on top of meta-oe's patch stack] | ||
28 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
29 | --- | ||
30 | absl/base/internal/unscaledcycleclock.cc | 12 ------------ | ||
31 | absl/base/internal/unscaledcycleclock_config.h | 5 ++--- | ||
32 | 2 files changed, 2 insertions(+), 15 deletions(-) | ||
33 | |||
34 | diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc | ||
35 | index f11fecb3..103b4f6a 100644 | ||
36 | --- a/absl/base/internal/unscaledcycleclock.cc | ||
37 | +++ b/absl/base/internal/unscaledcycleclock.cc | ||
38 | @@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { | ||
39 | return aarch64_timer_frequency; | ||
40 | } | ||
41 | |||
42 | -#elif defined(__riscv) | ||
43 | - | ||
44 | -int64_t UnscaledCycleClock::Now() { | ||
45 | - int64_t virtual_timer_value; | ||
46 | - asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); | ||
47 | - return virtual_timer_value; | ||
48 | -} | ||
49 | - | ||
50 | -double UnscaledCycleClock::Frequency() { | ||
51 | - return base_internal::NominalCPUFrequency(); | ||
52 | -} | ||
53 | - | ||
54 | #elif defined(_M_IX86) || defined(_M_X64) | ||
55 | |||
56 | #pragma intrinsic(__rdtsc) | ||
57 | diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h | ||
58 | index 5e232c1a..83552fc5 100644 | ||
59 | --- a/absl/base/internal/unscaledcycleclock_config.h | ||
60 | +++ b/absl/base/internal/unscaledcycleclock_config.h | ||
61 | @@ -22,7 +22,6 @@ | ||
62 | // The following platforms have an implementation of a hardware counter. | ||
63 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ | ||
64 | ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ | ||
65 | - defined(__riscv) || \ | ||
66 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) | ||
67 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 | ||
68 | #else | ||
69 | @@ -54,8 +53,8 @@ | ||
70 | #if ABSL_USE_UNSCALED_CYCLECLOCK | ||
71 | // This macro can be used to test if UnscaledCycleClock::Frequency() | ||
72 | // is NominalCPUFrequency() on a particular platform. | ||
73 | -#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ | ||
74 | - defined(_M_IX86) || defined(_M_X64)) | ||
75 | +#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ | ||
76 | + defined(_M_X64)) | ||
77 | #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY | ||
78 | #endif | ||
79 | #endif | ||
80 | -- | ||
81 | 2.44.0 | ||
82 | |||
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb index 2aef97391..87ab23931 100644 --- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb +++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb | |||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ | |||
14 | file://0002-Remove-maes-option-from-cross-compilation.patch \ | 14 | file://0002-Remove-maes-option-from-cross-compilation.patch \ |
15 | file://abseil-ppc-fixes.patch \ | 15 | file://abseil-ppc-fixes.patch \ |
16 | file://0003-Remove-neon-option-from-cross-compilation.patch \ | 16 | file://0003-Remove-neon-option-from-cross-compilation.patch \ |
17 | file://0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ | ||
17 | " | 18 | " |
18 | 19 | ||
19 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb index 3f9d49a2d..a91229f90 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs_1.0.bb | |||
@@ -3,6 +3,9 @@ SECTION = "console/utils" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
5 | 5 | ||
6 | S = "${WORKDIR}/sources" | ||
7 | UNPACKDIR = "${S}" | ||
8 | |||
6 | SRC_URI = " \ | 9 | SRC_URI = " \ |
7 | file://android-gadget-setup \ | 10 | file://android-gadget-setup \ |
8 | file://android-gadget-start \ | 11 | file://android-gadget-start \ |
@@ -14,17 +17,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
14 | 17 | ||
15 | do_install() { | 18 | do_install() { |
16 | install -d ${D}${bindir} | 19 | install -d ${D}${bindir} |
17 | install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} | 20 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} |
18 | install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir} | 21 | install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir} |
19 | install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir} | 22 | install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir} |
20 | 23 | ||
21 | if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then | 24 | if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then |
22 | install -d ${D}${sysconfdir} | 25 | install -d ${D}${sysconfdir} |
23 | install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir} | 26 | install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir} |
24 | fi | 27 | fi |
25 | 28 | ||
26 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | 29 | install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d |
27 | install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d | 30 | install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d |
28 | } | 31 | } |
29 | 32 | ||
30 | FILES:${PN} += " \ | 33 | FILES:${PN} += " \ |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb index 34b1a9bdd..f73be8dbb 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb | |||
@@ -9,7 +9,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
9 | 9 | ||
10 | do_install() { | 10 | do_install() { |
11 | install -d ${D}${bindir} | 11 | install -d ${D}${bindir} |
12 | install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} | 12 | install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} |
13 | } | 13 | } |
14 | 14 | ||
15 | python () { | 15 | python () { |
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff index 177d69a97..ddb41ea4b 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff +++ b/meta-oe/recipes-devtools/android-tools/android-tools/core/adb_libssl_11.diff | |||
@@ -17,9 +17,10 @@ Upstream-Status: Pending | |||
17 | +++ b/adb/adb_auth_host.c | 17 | +++ b/adb/adb_auth_host.c |
18 | @@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, | 18 | @@ -75,6 +75,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, |
19 | BIGNUM* rem = BN_new(); | 19 | BIGNUM* rem = BN_new(); |
20 | BIGNUM* n = BN_new(); | 20 | - BIGNUM* n = BN_new(); |
21 | + const BIGNUM* n; | ||
21 | BIGNUM* n0inv = BN_new(); | 22 | BIGNUM* n0inv = BN_new(); |
22 | + BIGNUM* e = BN_new(); | 23 | + const BIGNUM* e; |
23 | 24 | ||
24 | if (RSA_size(rsa) != RSANUMBYTES) { | 25 | if (RSA_size(rsa) != RSANUMBYTES) { |
25 | ret = 0; | 26 | ret = 0; |
@@ -32,7 +33,7 @@ Upstream-Status: Pending | |||
32 | BN_set_bit(r, RSANUMWORDS * 32); | 33 | BN_set_bit(r, RSANUMWORDS * 32); |
33 | BN_mod_sqr(rr, r, n, ctx); | 34 | BN_mod_sqr(rr, r, n, ctx); |
34 | BN_div(NULL, rem, n, r32, ctx); | 35 | BN_div(NULL, rem, n, r32, ctx); |
35 | @@ -96,7 +97,7 @@ static int RSA_to_RSAPublicKey(RSA *rsa, | 36 | @@ -96,11 +97,10 @@ static int RSA_to_RSAPublicKey(RSA *rsa, |
36 | BN_div(n, rem, n, r32, ctx); | 37 | BN_div(n, rem, n, r32, ctx); |
37 | pkey->n[i] = BN_get_word(rem); | 38 | pkey->n[i] = BN_get_word(rem); |
38 | } | 39 | } |
@@ -41,3 +42,7 @@ Upstream-Status: Pending | |||
41 | 42 | ||
42 | out: | 43 | out: |
43 | BN_free(n0inv); | 44 | BN_free(n0inv); |
45 | - BN_free(n); | ||
46 | BN_free(rem); | ||
47 | BN_free(r); | ||
48 | BN_free(rr); | ||
diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 1c66ea499..6343256d3 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb | |||
@@ -88,7 +88,7 @@ TOOLS:class-native = "fastboot ext4_utils mkbootimg" | |||
88 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" | 88 | TOOLS:class-nativesdk = "fastboot ext4_utils mkbootimg" |
89 | 89 | ||
90 | do_compile() { | 90 | do_compile() { |
91 | cp ${WORKDIR}/gitignore ${S}/.gitignore | 91 | cp ${UNPACKDIR}/gitignore ${S}/.gitignore |
92 | 92 | ||
93 | # Setting both variables below causing our makefiles to not work with | 93 | # Setting both variables below causing our makefiles to not work with |
94 | # implicit make rules | 94 | # implicit make rules |
@@ -123,7 +123,7 @@ do_compile() { | |||
123 | 123 | ||
124 | for tool in ${TOOLS}; do | 124 | for tool in ${TOOLS}; do |
125 | mkdir -p ${B}/${tool} | 125 | mkdir -p ${B}/${tool} |
126 | oe_runmake -f ${B}/${tool}.mk -C ${B}/${tool} | 126 | oe_runmake -f ${UNPACKDIR}/${BPN}/${tool}.mk -C ${B}/${tool} |
127 | done | 127 | done |
128 | } | 128 | } |
129 | 129 | ||
@@ -151,7 +151,7 @@ do_install() { | |||
151 | fi | 151 | fi |
152 | 152 | ||
153 | # Outside the if statement to avoid errors during do_package | 153 | # Outside the if statement to avoid errors during do_package |
154 | install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \ | 154 | install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \ |
155 | ${D}${systemd_unitdir}/system/android-tools-adbd.service | 155 | ${D}${systemd_unitdir}/system/android-tools-adbd.service |
156 | 156 | ||
157 | if echo ${TOOLS} | grep -q "fastboot" ; then | 157 | if echo ${TOOLS} | grep -q "fastboot" ; then |
diff --git a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb index 6c8934b34..5e992845a 100644 --- a/meta-oe/recipes-devtools/cjson/cjson_1.7.17.bb +++ b/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0" | |||
7 | SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ | 7 | SRC_URI = "git://github.com/DaveGamble/cJSON.git;branch=master;protocol=https \ |
8 | file://run-ptest \ | 8 | file://run-ptest \ |
9 | " | 9 | " |
10 | SRCREV = "87d8f0961a01bf09bef98ff89bae9fdec42181ee" | 10 | SRCREV = "acc76239bee01d8e9c858ae2cab296704e52d916" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
diff --git a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb index d4ffbb7f0..f8add448b 100644 --- a/meta-oe/recipes-devtools/ctags/ctags_6.1.20240310.0.bb +++ b/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | |||
14 | 14 | ||
15 | inherit autotools-brokensep pkgconfig manpages | 15 | inherit autotools-brokensep pkgconfig manpages |
16 | 16 | ||
17 | SRCREV = "38fd8e39b877a79666393b90e38400fd8d7d5d14" | 17 | SRCREV = "653ca9204527fe1da7ecf97c3da4308f9ab17d2c" |
18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" | 18 | SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" |
19 | 19 | ||
20 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb index 479b98d44..599675a34 100644 --- a/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb +++ b/meta-oe/recipes-devtools/dnf-plugin-tui/dnf-plugin-tui_1.4.bb | |||
@@ -24,7 +24,7 @@ do_install:append() { | |||
24 | 24 | ||
25 | do_install:append:class-target() { | 25 | do_install:append:class-target() { |
26 | install -d ${D}${sysconfdir}/yum.repos.d | 26 | install -d ${D}${sysconfdir}/yum.repos.d |
27 | install -m 0644 ${WORKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d | 27 | install -m 0644 ${UNPACKDIR}/oe-remote.repo.sample ${D}${sysconfdir}/yum.repos.d |
28 | } | 28 | } |
29 | 29 | ||
30 | do_install:append:class-nativesdk() { | 30 | do_install:append:class-nativesdk() { |
diff --git a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb index 976120b51..2c594d229 100644 --- a/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.6.bb +++ b/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb | |||
@@ -2,12 +2,12 @@ SUMMARY = "EditorConfig helps maintain consistent coding styles across various e | |||
2 | HOMEPAGE = "https://https://editorconfig.org" | 2 | HOMEPAGE = "https://https://editorconfig.org" |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | LICENSE = "BSD-2-Clause" | 4 | LICENSE = "BSD-2-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f515fff3ea0a2b9797eda60d83c0e5ca" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8" |
6 | 6 | ||
7 | SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" | 7 | SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | SRCREV = "b7837029494c03af5ea70ed9d265e8c2123bff53" | 10 | SRCREV = "fd8cf1e94ecf4e6e4493833f96140cf9bd17578e" |
11 | 11 | ||
12 | inherit cmake | 12 | inherit cmake |
13 | 13 | ||
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb index 0f6bbb4d5..f9e2c7873 100644 --- a/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb +++ b/meta-oe/recipes-devtools/iptraf/iptraf-ng_1.2.1.bb | |||
@@ -42,7 +42,7 @@ do_compile() { | |||
42 | do_install() { | 42 | do_install() { |
43 | oe_runmake DESTDIR=${D} install | 43 | oe_runmake DESTDIR=${D} install |
44 | install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng | 44 | install -D -m 0644 -p ${S}/iptraf-ng-logrotate.conf ${D}${sysconfdir}/logrotate.d/iptraf-ng |
45 | install -Dm 0644 ${WORKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf | 45 | install -Dm 0644 ${UNPACKDIR}/iptraf-ng-tmpfiles.conf ${D}${libdir}/tmpfiles.d/iptraf-ng-tmpfiles.conf |
46 | } | 46 | } |
47 | 47 | ||
48 | FILES:${PN} += "${libdir}/tmpfiles.d" | 48 | FILES:${PN} += "${libdir}/tmpfiles.d" |
diff --git a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb index 7e0272f89..cc21c8bea 100644 --- a/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb +++ b/meta-oe/recipes-devtools/jemalloc/jemalloc_5.3.0.bb | |||
@@ -17,6 +17,8 @@ SRC_URI = "git://github.com/jemalloc/jemalloc.git;branch=dev;protocol=https \ | |||
17 | file://run-ptest \ | 17 | file://run-ptest \ |
18 | " | 18 | " |
19 | SRCREV = "630434bb0ac619f7beec927569782d924c459385" | 19 | SRCREV = "630434bb0ac619f7beec927569782d924c459385" |
20 | PV_LONG := "${PV}-171-g${SRCREV}" | ||
21 | PV .= "+git" | ||
20 | 22 | ||
21 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
22 | 24 | ||
@@ -27,7 +29,7 @@ EXTRA_AUTORECONF += "--exclude=autoheader" | |||
27 | EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" | 29 | EXTRA_OECONF:append:libc-musl = " --with-jemalloc-prefix=je_" |
28 | # For some reason VERSION file populated only in tarball distribution. | 30 | # For some reason VERSION file populated only in tarball distribution. |
29 | # Adding jemalloc version since this recipe is using source code from git tag | 31 | # Adding jemalloc version since this recipe is using source code from git tag |
30 | EXTRA_OECONF:append = " --with-version=${PV}-0-g${SRCREV} --enable-xmalloc" | 32 | EXTRA_OECONF:append = " --with-version=${PV_LONG} --enable-xmalloc" |
31 | 33 | ||
32 | do_install:append() { | 34 | do_install:append() { |
33 | sed -i -e 's@${STAGING_DIR_HOST}@@g' \ | 35 | sed -i -e 's@${STAGING_DIR_HOST}@@g' \ |
diff --git a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb index 0ed6e8235..4f9099ff0 100644 --- a/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb +++ b/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb | |||
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | |||
11 | GNOMEBASEBUILDCLASS = "autotools" | 11 | GNOMEBASEBUILDCLASS = "autotools" |
12 | inherit gnomebase vala gobject-introspection | 12 | inherit gnomebase vala gobject-introspection |
13 | 13 | ||
14 | CFLAGS += "-Wno-incompatible-pointer-types" | ||
15 | |||
14 | do_configure:prepend() { | 16 | do_configure:prepend() { |
15 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | 17 | MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" |
16 | for i in ${MACROS}; do | 18 | for i in ${MACROS}; do |
diff --git a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb index 2451a36be..89e6744dc 100644 --- a/meta-oe/recipes-devtools/mercurial/mercurial_6.5.bb +++ b/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb | |||
@@ -10,7 +10,7 @@ RDEPENDS:${PN} = "python3 python3-modules" | |||
10 | inherit python3native python3targetconfig | 10 | inherit python3native python3targetconfig |
11 | 11 | ||
12 | SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" | 12 | SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" |
13 | SRC_URI[sha256sum] = "a5603d0d395ebf67fe5d27abbb3bd37fcc01871ecf394c793672d2c1e68be7e7" | 13 | SRC_URI[sha256sum] = "f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307" |
14 | 14 | ||
15 | S = "${WORKDIR}/mercurial-${PV}" | 15 | S = "${WORKDIR}/mercurial-${PV}" |
16 | 16 | ||
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb index a61dd5018..d4b818f96 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb | |||
@@ -8,10 +8,13 @@ SRC_URI = "\ | |||
8 | 8 | ||
9 | inherit native | 9 | inherit native |
10 | 10 | ||
11 | S = "${WORKDIR}/sources" | ||
12 | UNPACKDIR = "${S}" | ||
13 | |||
11 | B = "${WORKDIR}/build" | 14 | B = "${WORKDIR}/build" |
12 | 15 | ||
13 | do_configure() { | 16 | do_configure() { |
14 | sed -e 's!@@libdir@@!${libdir}!g' < '${WORKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' | 17 | sed -e 's!@@libdir@@!${libdir}!g' < '${UNPACKDIR}/oe-npm-cache' > '${B}/oe-npm-cache' |
15 | } | 18 | } |
16 | 19 | ||
17 | do_install() { | 20 | do_install() { |
diff --git a/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb new file mode 100644 index 000000000..0eaf2137b --- /dev/null +++ b/meta-oe/recipes-devtools/perl/dbd-mariadb_1.23.bb | |||
@@ -0,0 +1,20 @@ | |||
1 | DESPCRIPTION = "DBD::MariaDB is the Perl5 Database Interface driver for MariaDB and MySQL databases." | ||
2 | HOMEPAGE = "https://metacpan.org/dist/DBD-MariaDB" | ||
3 | LICENSE = "GPL-1.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" | ||
5 | |||
6 | DEPENDS = "libdbi-perl-native libdev-checklib-perl-native libmysqlclient" | ||
7 | |||
8 | SRC_URI = "${CPAN_MIRROR}/authors/id/P/PA/PALI/DBD-MariaDB-${PV}.tar.gz" | ||
9 | SRC_URI[sha256sum] = "0d0c76c660ddd55570e48f3e2fdea8f621a69ac0ed48190e8cfcafcb5e9b859d" | ||
10 | |||
11 | RDEPENDS:${PN} = "libdbi-perl" | ||
12 | |||
13 | S = "${WORKDIR}/DBD-MariaDB-${PV}" | ||
14 | |||
15 | inherit cpan | ||
16 | |||
17 | RDEPENDS:${PN}-ptest += " \ | ||
18 | libtest-warnings-perl \ | ||
19 | perl-module-test-more \ | ||
20 | " | ||
diff --git a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb b/meta-oe/recipes-devtools/perl/exiftool_12.85.bb index ba3e3fdf7..66e9a3b71 100644 --- a/meta-oe/recipes-devtools/perl/exiftool_12.72.bb +++ b/meta-oe/recipes-devtools/perl/exiftool_12.85.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff | |||
7 | 7 | ||
8 | inherit cpan | 8 | inherit cpan |
9 | 9 | ||
10 | SRCREV = "fc4f6614ff0c19bb5f332a9c464dcef7267931df" | 10 | SRCREV = "405674e0c477931b60b10a78828483ef54761385" |
11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" | 11 | SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" |
12 | 12 | ||
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
diff --git a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb b/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb deleted file mode 100644 index fc505fe1e..000000000 --- a/meta-oe/recipes-devtools/perl/libdbd-mysql-perl_4.050.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | SUMMARY = "A Perl DBI driver for MySQL" | ||
2 | DESCRIPTION = "DBD::mysql is the Perl5 Database Interface driver for \ | ||
3 | the MySQL database. In other words: DBD::mysql is an interface between \ | ||
4 | the Perl programming language and the MySQL programming API that comes \ | ||
5 | with the MySQL relational database management system. Most functions \ | ||
6 | provided by this programming API are supported. Some rarely used \ | ||
7 | functions are missing, mainly because no-one ever requested them. \ | ||
8 | " | ||
9 | HOMEPAGE = "https://github.com/perl5-dbi/DBD-mysql" | ||
10 | |||
11 | SECTION = "libs" | ||
12 | LICENSE = "Artistic-1.0 | GPL-1.0-or-later" | ||
13 | DEPENDS += "libdev-checklib-perl-native libdbi-perl-native libmysqlclient" | ||
14 | |||
15 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d0a06964340e5c0cde88b7af611f755c" | ||
16 | |||
17 | SRCREV = "9b5b70ea372f49fe9bc9e592dae3870596d1e3d6" | ||
18 | SRC_URI = "git://github.com/perl5-dbi/DBD-mysql.git;protocol=https;branch=master" | ||
19 | |||
20 | S = "${WORKDIR}/git" | ||
21 | |||
22 | inherit cpan | ||
diff --git a/meta-oe/recipes-devtools/php/php_8.2.18.bb b/meta-oe/recipes-devtools/php/php_8.2.18.bb index da04ffba6..e662f6806 100644 --- a/meta-oe/recipes-devtools/php/php_8.2.18.bb +++ b/meta-oe/recipes-devtools/php/php_8.2.18.bb | |||
@@ -182,19 +182,19 @@ do_install:append:class-target() { | |||
182 | rm -rf ${D}/.[a-z]* | 182 | rm -rf ${D}/.[a-z]* |
183 | rm -rf ${D}/var | 183 | rm -rf ${D}/var |
184 | rm -f ${D}/${sysconfdir}/php-fpm.conf.default | 184 | rm -f ${D}/${sysconfdir}/php-fpm.conf.default |
185 | install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf | 185 | install -m 0644 ${UNPACKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf |
186 | install -d ${D}/${sysconfdir}/apache2/conf.d | 186 | install -d ${D}/${sysconfdir}/apache2/conf.d |
187 | install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf | 187 | install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf |
188 | install -d ${D}${sysconfdir}/init.d | 188 | install -d ${D}${sysconfdir}/init.d |
189 | sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm | 189 | sed -i 's:=/usr/sbin:=${sbindir}:g' ${B}/sapi/fpm/init.d.php-fpm |
190 | sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm | 190 | sed -i 's:=/etc:=${sysconfdir}:g' ${B}/sapi/fpm/init.d.php-fpm |
191 | sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm | 191 | sed -i 's:=/var:=${localstatedir}:g' ${B}/sapi/fpm/init.d.php-fpm |
192 | install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm | 192 | install -m 0755 ${B}/sapi/fpm/init.d.php-fpm ${D}${sysconfdir}/init.d/php-fpm |
193 | install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf | 193 | install -m 0644 ${UNPACKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf |
194 | 194 | ||
195 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then | 195 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then |
196 | install -d ${D}${systemd_system_unitdir} | 196 | install -d ${D}${systemd_system_unitdir} |
197 | install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service | 197 | install -m 0644 ${UNPACKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service |
198 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service | 198 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service |
199 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service | 199 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service |
200 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service | 200 | sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service |
@@ -203,7 +203,7 @@ do_install:append:class-target() { | |||
203 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then | 203 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then |
204 | install -d ${D}${sysconfdir}/apache2/modules.d | 204 | install -d ${D}${sysconfdir}/apache2/modules.d |
205 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} | 205 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} |
206 | install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d | 206 | install -m 644 ${UNPACKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d |
207 | sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf | 207 | sed -i s,lib/,${libexecdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf |
208 | cat ${S}/php.ini-production | \ | 208 | cat ${S}/php.ini-production | \ |
209 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ | 209 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ |
diff --git a/meta-oe/recipes-devtools/poke/poke_4.0.bb b/meta-oe/recipes-devtools/poke/poke_4.1.bb index 9e68ba4ea..296368070 100644 --- a/meta-oe/recipes-devtools/poke/poke_4.0.bb +++ b/meta-oe/recipes-devtools/poke/poke_4.1.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ | |||
11 | 11 | ||
12 | DEPENDS = "flex-native bison-native bdwgc readline" | 12 | DEPENDS = "flex-native bison-native bdwgc readline" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "02bab22cb1fa6153a1b6a927c8bb3cd58d508543c144842a6d7ee74f19973a77" | 14 | SRC_URI[sha256sum] = "08ecaea41f7374acd4238e12bbf97e8cd5e572d5917e956b73b9d43026e9d740" |
15 | 15 | ||
16 | # poke does not support using out-of-tree builds | 16 | # poke does not support using out-of-tree builds |
17 | inherit autotools-brokensep gettext pkgconfig | 17 | inherit autotools-brokensep gettext pkgconfig |
diff --git a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb index 324134596..4f8515471 100644 --- a/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb +++ b/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb | |||
@@ -116,3 +116,4 @@ LDFLAGS:append:arm = " -latomic" | |||
116 | LDFLAGS:append:mips = " -latomic" | 116 | LDFLAGS:append:mips = " -latomic" |
117 | LDFLAGS:append:powerpc = " -latomic" | 117 | LDFLAGS:append:powerpc = " -latomic" |
118 | LDFLAGS:append:mipsel = " -latomic" | 118 | LDFLAGS:append:mipsel = " -latomic" |
119 | LDFLAGS:append:riscv32 = " -latomic" | ||
diff --git a/meta-oe/recipes-devtools/python/python3-pefile/run-ptest b/meta-oe/recipes-devtools/python/python3-pefile/run-ptest new file mode 100644 index 000000000..95ae72306 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python3-pefile/run-ptest | |||
@@ -0,0 +1,3 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | pytest --automake --ignore=./tests/pefile_test.py | ||
diff --git a/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb new file mode 100644 index 000000000..e30b36232 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Python PE parsing module" | ||
2 | DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files." | ||
3 | HOMEPAGE = "https://github.com/erocarrera/pefile" | ||
4 | LICENSE = "MIT" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38066667888b01d8118ff9cc23da1873" | ||
6 | |||
7 | inherit setuptools3 ptest | ||
8 | SRCREV = "1ab2807c4eec16041e791d7a6acc68cc23fd5266" | ||
9 | SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \ | ||
10 | file://run-ptest" | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | BBCLASSEXTEND = "native nativesdk" | ||
14 | |||
15 | do_install_ptest() { | ||
16 | install -d ${D}${PTEST_PATH}/tests | ||
17 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | ||
18 | } | ||
19 | |||
20 | RDEPENDS:${PN} += " \ | ||
21 | python3-mmap \ | ||
22 | python3-netclient \ | ||
23 | python3-stringold \ | ||
24 | " | ||
25 | RDEPENDS:${PN}-ptest += "\ | ||
26 | python3-pytest \ | ||
27 | python3-unittest-automake-output \ | ||
28 | " | ||
diff --git a/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb new file mode 100644 index 000000000..1b064faf1 --- /dev/null +++ b/meta-oe/recipes-devtools/sexpect/sexpect_2.3.14.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | SUMMARY = "sexpect is another implementation of Expect which is specifically designed for Shell scripts" | ||
2 | HOMEPAGE = "https://github.com/clarkwang/sexpect" | ||
3 | LICENSE = "GPL-3.0-only" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | ||
5 | |||
6 | BRANCH = "master" | ||
7 | SRC_URI = "git://github.com/clarkwang/sexpect;branch=${BRANCH};protocol=https" | ||
8 | SRCREV = "532a52d36aae442b7fe1ce20a59effd1dbc6e6fe" | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | inherit cmake | ||
diff --git a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb index 880af82bb..a542396d4 100644 --- a/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.2.0.bb +++ b/meta-oe/recipes-devtools/squashfs-tools-ng/squashfs-tools-ng_1.3.1.bb | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING.md;md5=a709b68f1ce8a9f10aeea6401446c1f4 \ | |||
11 | file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ | 11 | file://licenses/zstd.txt;md5=8df8137b630239cbdd4c0674124cb0c8 \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "f2a3ad56e40c9711b23371238f9fa07dd24245f1" | 14 | SRCREV = "8f9966c8ea3ea8a854941d041e7fcb9eb4f772fb" |
15 | SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=master" | 15 | SRC_URI = "git://github.com/AgentD/squashfs-tools-ng.git;protocol=https;branch=fixes-1.3.0" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
diff --git a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb index f7160f508..3360ccf35 100644 --- a/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb +++ b/meta-oe/recipes-devtools/systemd/nativesdk-systemd-systemctl.bb | |||
@@ -7,9 +7,10 @@ inherit nativesdk | |||
7 | 7 | ||
8 | SRC_URI = "file://systemctl" | 8 | SRC_URI = "file://systemctl" |
9 | 9 | ||
10 | S = "${WORKDIR}" | 10 | S = "${WORKDIR}/sources" |
11 | UNPACKDIR = "${S}" | ||
11 | 12 | ||
12 | do_install() { | 13 | do_install() { |
13 | install -d ${D}${bindir} | 14 | install -d ${D}${bindir} |
14 | install -m 0755 ${WORKDIR}/systemctl ${D}${bindir} | 15 | install -m 0755 ${UNPACKDIR}/systemctl ${D}${bindir} |
15 | } | 16 | } |
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch new file mode 100644 index 000000000..8744cdd10 --- /dev/null +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap/uw-imap-fix-incompatible-pointer-types.patch | |||
@@ -0,0 +1,355 @@ | |||
1 | Fix compile errors when gcc option '-Wincompatible-pointer-types' set: | ||
2 | |||
3 | mx.c: In function 'mx_setdate': | ||
4 | mx.c:1286:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] | ||
5 | 1286 | utime (file,tp); /* set the times */ | ||
6 | | ^~ | ||
7 | | | | ||
8 | | time_t * {aka long int *} | ||
9 | |||
10 | Upstream-Status: Inactive-Upstream [lastrelease: 2011] | ||
11 | |||
12 | [1]: https://en.wikipedia.org/wiki/UW_IMAP | ||
13 | |||
14 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
15 | |||
16 | --- | ||
17 | src/osdep/unix/mbx.c | 12 ++++++------ | ||
18 | src/osdep/unix/mh.c | 2 +- | ||
19 | src/osdep/unix/mmdf.c | 10 +++++----- | ||
20 | src/osdep/unix/mtx.c | 16 ++++++++-------- | ||
21 | src/osdep/unix/mx.c | 2 +- | ||
22 | src/osdep/unix/tenex.c | 16 ++++++++-------- | ||
23 | src/osdep/unix/unix.c | 10 +++++----- | ||
24 | 7 files changed, 34 insertions(+), 34 deletions(-) | ||
25 | |||
26 | diff --git a/src/osdep/unix/mbx.c b/src/osdep/unix/mbx.c | ||
27 | index c8a45a5..0a587fe 100644 | ||
28 | --- a/src/osdep/unix/mbx.c | ||
29 | +++ b/src/osdep/unix/mbx.c | ||
30 | @@ -302,7 +302,7 @@ int mbx_isvalid (MAILSTREAM **stream,char *name,char *tmp,int *ld,char *lock, | ||
31 | if (sbuf.st_ctime > sbuf.st_atime) { | ||
32 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
33 | tp[1] = sbuf.st_mtime; | ||
34 | - utime (tmp,tp); /* set the times */ | ||
35 | + utime (tmp, (const struct utimbuf *)tp); /* set the times */ | ||
36 | } | ||
37 | } | ||
38 | /* in case INBOX but not mbx format */ | ||
39 | @@ -776,7 +776,7 @@ void mbx_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags) | ||
40 | stream->user_flags[LOCAL->ffuserflag]) || (oldpid != LOCAL->lastpid)) | ||
41 | mbx_update_header (stream); | ||
42 | tp[0] = time (0); /* make sure read comes after all that */ | ||
43 | - utime (stream->mailbox,tp); | ||
44 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
45 | } | ||
46 | if (LOCAL->ld >= 0) { /* unlock now */ | ||
47 | unlockfd (LOCAL->ld,LOCAL->lock); | ||
48 | @@ -1075,7 +1075,7 @@ long mbx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
49 | /* else preserve \Marked status */ | ||
50 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
51 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
52 | - utime (file,tp); /* set the times */ | ||
53 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
54 | close (fd); /* close the file */ | ||
55 | MM_NOCRITICAL (stream); /* release critical */ | ||
56 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
57 | @@ -1213,7 +1213,7 @@ long mbx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
58 | /* else preserve \Marked status */ | ||
59 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
60 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
61 | - utime (file,tp); /* set the times */ | ||
62 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
63 | fclose (df); /* close the file */ | ||
64 | MM_NOCRITICAL (dstream); /* release critical */ | ||
65 | } | ||
66 | @@ -1446,7 +1446,7 @@ long mbx_parse (MAILSTREAM *stream) | ||
67 | time_t tp[2]; | ||
68 | tp[0] = time (0); | ||
69 | tp[1] = LOCAL->filetime; | ||
70 | - utime (stream->mailbox,tp); | ||
71 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
72 | } | ||
73 | stream->silent = silent; /* can pass up events now */ | ||
74 | mail_exists (stream,nmsgs); /* notify upper level of new mailbox size */ | ||
75 | @@ -1814,7 +1814,7 @@ unsigned long mbx_rewrite (MAILSTREAM *stream,unsigned long *reclaimed, | ||
76 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
77 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
78 | tp[0] = time (0); /* reset atime to now */ | ||
79 | - utime (stream->mailbox,tp); | ||
80 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
81 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
82 | /* notify upper level of new mailbox size */ | ||
83 | mail_exists (stream,stream->nmsgs); | ||
84 | diff --git a/src/osdep/unix/mh.c b/src/osdep/unix/mh.c | ||
85 | index 9264624..26f3539 100644 | ||
86 | --- a/src/osdep/unix/mh.c | ||
87 | +++ b/src/osdep/unix/mh.c | ||
88 | @@ -1279,5 +1279,5 @@ void mh_setdate (char *file,MESSAGECACHE *elt) | ||
89 | time_t tp[2]; | ||
90 | tp[0] = time (0); /* atime is now */ | ||
91 | tp[1] = mail_longdate (elt); /* modification time */ | ||
92 | - utime (file,tp); /* set the times */ | ||
93 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
94 | } | ||
95 | diff --git a/src/osdep/unix/mmdf.c b/src/osdep/unix/mmdf.c | ||
96 | index e962434..c0adbee 100644 | ||
97 | --- a/src/osdep/unix/mmdf.c | ||
98 | +++ b/src/osdep/unix/mmdf.c | ||
99 | @@ -379,7 +379,7 @@ long mmdf_isvalid (char *name,char *tmp) | ||
100 | if ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) { | ||
101 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
102 | tp[1] = sbuf.st_mtime; | ||
103 | - utime (file,tp); /* set the times */ | ||
104 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
105 | } | ||
106 | } | ||
107 | } | ||
108 | @@ -1131,7 +1131,7 @@ long mmdf_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
109 | else tp[0] = /* else preserve \Marked status */ | ||
110 | ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) ? | ||
111 | sbuf.st_atime : tp[1]; | ||
112 | - utime (file,tp); /* set the times */ | ||
113 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
114 | mmdf_unlock (fd,NIL,&lock); /* unlock and close mailbox */ | ||
115 | if (tstream) { /* update last UID if we can */ | ||
116 | MMDFLOCAL *local = (MMDFLOCAL *) tstream->local; | ||
117 | @@ -1292,7 +1292,7 @@ long mmdf_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
118 | ret = NIL; /* return error */ | ||
119 | } | ||
120 | else tp[0] = tp[1] - 1; /* set atime to now-1 if successful copy */ | ||
121 | - utime (file,tp); /* set the times */ | ||
122 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
123 | fclose (sf); /* done with scratch file */ | ||
124 | /* force UIDVALIDITY assignment now */ | ||
125 | if (tstream && !tstream->uid_validity) tstream->uid_validity = time (0); | ||
126 | @@ -1550,7 +1550,7 @@ void mmdf_unlock (int fd,MAILSTREAM *stream,DOTLOCK *lock) | ||
127 | } | ||
128 | else now = 0; /* no time change needed */ | ||
129 | /* set the times, note change */ | ||
130 | - if (now && !utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
131 | + if (now && !utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
132 | } | ||
133 | flock (fd,LOCK_UN); /* release flock'ers */ | ||
134 | if (!stream) close (fd); /* close the file if no stream */ | ||
135 | @@ -2393,7 +2393,7 @@ long mmdf_rewrite (MAILSTREAM *stream,unsigned long *nexp,DOTLOCK *lock, | ||
136 | /* set atime to now, mtime a second earlier */ | ||
137 | tp[1] = (tp[0] = time (0)) - 1; | ||
138 | /* set the times, note change */ | ||
139 | - if (!utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
140 | + if (!utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
141 | close (LOCAL->fd); /* close and reopen file */ | ||
142 | if ((LOCAL->fd = open (stream->mailbox,O_RDWR, | ||
143 | (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL))) | ||
144 | diff --git a/src/osdep/unix/mtx.c b/src/osdep/unix/mtx.c | ||
145 | index 8e6f76e..f64142b 100644 | ||
146 | --- a/src/osdep/unix/mtx.c | ||
147 | +++ b/src/osdep/unix/mtx.c | ||
148 | @@ -196,7 +196,7 @@ int mtx_isvalid (char *name,char *tmp) | ||
149 | if (sbuf.st_ctime > sbuf.st_atime) { | ||
150 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
151 | tp[1] = sbuf.st_mtime; | ||
152 | - utime (file,tp); /* set the times */ | ||
153 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
154 | } | ||
155 | } | ||
156 | } | ||
157 | @@ -565,7 +565,7 @@ void mtx_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags) | ||
158 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
159 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
160 | tp[0] = time (0); /* make sure read comes after all that */ | ||
161 | - utime (stream->mailbox,tp); | ||
162 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
163 | } | ||
164 | } | ||
165 | |||
166 | @@ -834,7 +834,7 @@ long mtx_expunge (MAILSTREAM *stream,char *sequence,long options) | ||
167 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
168 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
169 | tp[0] = time (0); /* reset atime to now */ | ||
170 | - utime (stream->mailbox,tp); | ||
171 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
172 | MM_NOCRITICAL (stream); /* release critical */ | ||
173 | /* notify upper level of new mailbox size */ | ||
174 | mail_exists (stream,stream->nmsgs); | ||
175 | @@ -929,7 +929,7 @@ long mtx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
176 | /* else preserve \Marked status */ | ||
177 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
178 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
179 | - utime (file,tp); /* set the times */ | ||
180 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
181 | close (fd); /* close the file */ | ||
182 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
183 | MM_NOCRITICAL (stream); /* release critical */ | ||
184 | @@ -946,7 +946,7 @@ long mtx_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
185 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
186 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
187 | tp[0] = time (0); /* make sure atime remains greater */ | ||
188 | - utime (stream->mailbox,tp); | ||
189 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
190 | } | ||
191 | } | ||
192 | if (ret && mail_parameters (NIL,GET_COPYUID,NIL)) | ||
193 | @@ -1062,7 +1062,7 @@ long mtx_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
194 | /* else preserve \Marked status */ | ||
195 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
196 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
197 | - utime (file,tp); /* set the times */ | ||
198 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
199 | fclose (df); /* close the file */ | ||
200 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
201 | MM_NOCRITICAL (stream); /* release critical */ | ||
202 | @@ -1212,7 +1212,7 @@ long mtx_parse (MAILSTREAM *stream) | ||
203 | time_t tp[2]; | ||
204 | tp[0] = time (0); | ||
205 | tp[1] = LOCAL->filetime; | ||
206 | - utime (stream->mailbox,tp); | ||
207 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
208 | } | ||
209 | stream->silent = silent; /* can pass up events now */ | ||
210 | mail_exists (stream,nmsgs); /* notify upper level of new mailbox size */ | ||
211 | @@ -1312,7 +1312,7 @@ void mtx_update_status (MAILSTREAM *stream,unsigned long msgno,long syncflag) | ||
212 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
213 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
214 | tp[0] = time (0); /* make sure read is later */ | ||
215 | - utime (stream->mailbox,tp); | ||
216 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
217 | } | ||
218 | } | ||
219 | } | ||
220 | diff --git a/src/osdep/unix/mx.c b/src/osdep/unix/mx.c | ||
221 | index b5c5adf..4146409 100644 | ||
222 | --- a/src/osdep/unix/mx.c | ||
223 | +++ b/src/osdep/unix/mx.c | ||
224 | @@ -1283,5 +1283,5 @@ void mx_setdate (char *file,MESSAGECACHE *elt) | ||
225 | time_t tp[2]; | ||
226 | tp[0] = time (0); /* atime is now */ | ||
227 | tp[1] = mail_longdate (elt); /* modification time */ | ||
228 | - utime (file,tp); /* set the times */ | ||
229 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
230 | } | ||
231 | diff --git a/src/osdep/unix/tenex.c b/src/osdep/unix/tenex.c | ||
232 | index eee61fb..622da61 100644 | ||
233 | --- a/src/osdep/unix/tenex.c | ||
234 | +++ b/src/osdep/unix/tenex.c | ||
235 | @@ -203,7 +203,7 @@ int tenex_isvalid (char *name,char *tmp) | ||
236 | if (sbuf.st_ctime > sbuf.st_atime) { | ||
237 | tp[0] = sbuf.st_atime; /* preserve atime and mtime */ | ||
238 | tp[1] = sbuf.st_mtime; | ||
239 | - utime (file,tp); /* set the times */ | ||
240 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
241 | } | ||
242 | } | ||
243 | } | ||
244 | @@ -654,7 +654,7 @@ void tenex_flag (MAILSTREAM *stream,char *sequence,char *flag,long flags) | ||
245 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
246 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
247 | tp[0] = time (0); /* make sure read comes after all that */ | ||
248 | - utime (stream->mailbox,tp); | ||
249 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
250 | } | ||
251 | } | ||
252 | |||
253 | @@ -924,7 +924,7 @@ long tenex_expunge (MAILSTREAM *stream,char *sequence,long options) | ||
254 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
255 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
256 | tp[0] = time (0); /* reset atime to now */ | ||
257 | - utime (stream->mailbox,tp); | ||
258 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
259 | MM_NOCRITICAL (stream); /* release critical */ | ||
260 | /* notify upper level of new mailbox size */ | ||
261 | mail_exists (stream,stream->nmsgs); | ||
262 | @@ -1019,7 +1019,7 @@ long tenex_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
263 | /* else preserve \Marked status */ | ||
264 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
265 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
266 | - utime (file,tp); /* set the times */ | ||
267 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
268 | close (fd); /* close the file */ | ||
269 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
270 | MM_NOCRITICAL (stream); /* release critical */ | ||
271 | @@ -1036,7 +1036,7 @@ long tenex_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
272 | fstat (LOCAL->fd,&sbuf); /* get current write time */ | ||
273 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
274 | tp[0] = time (0); /* make sure atime remains greater */ | ||
275 | - utime (stream->mailbox,tp); | ||
276 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
277 | } | ||
278 | } | ||
279 | if (ret && mail_parameters (NIL,GET_COPYUID,NIL)) | ||
280 | @@ -1159,7 +1159,7 @@ long tenex_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
281 | /* else preserve \Marked status */ | ||
282 | else tp[0] = (sbuf.st_ctime > sbuf.st_atime) ? sbuf.st_atime : time(0); | ||
283 | tp[1] = sbuf.st_mtime; /* preserve mtime */ | ||
284 | - utime (file,tp); /* set the times */ | ||
285 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
286 | fclose (df); /* close the file */ | ||
287 | unlockfd (ld,lock); /* release exclusive parse/append permission */ | ||
288 | MM_NOCRITICAL (stream); /* release critical */ | ||
289 | @@ -1324,7 +1324,7 @@ long tenex_parse (MAILSTREAM *stream) | ||
290 | time_t tp[2]; | ||
291 | tp[0] = time (0); | ||
292 | tp[1] = LOCAL->filetime; | ||
293 | - utime (stream->mailbox,tp); | ||
294 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
295 | } | ||
296 | stream->silent = silent; /* can pass up events now */ | ||
297 | mail_exists (stream,nmsgs); /* notify upper level of new mailbox size */ | ||
298 | @@ -1424,7 +1424,7 @@ void tenex_update_status (MAILSTREAM *stream,unsigned long msgno,long syncflag) | ||
299 | fstat (LOCAL->fd,&sbuf); /* get new write time */ | ||
300 | tp[1] = LOCAL->filetime = sbuf.st_mtime; | ||
301 | tp[0] = time (0); /* make sure read is later */ | ||
302 | - utime (stream->mailbox,tp); | ||
303 | + utime (stream->mailbox, (const struct utimbuf *)tp); | ||
304 | } | ||
305 | } | ||
306 | } | ||
307 | diff --git a/src/osdep/unix/unix.c b/src/osdep/unix/unix.c | ||
308 | index 86be3f9..012dc83 100644 | ||
309 | --- a/src/osdep/unix/unix.c | ||
310 | +++ b/src/osdep/unix/unix.c | ||
311 | @@ -232,7 +232,7 @@ DRIVER *unix_valid (char *name) | ||
312 | if ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) { | ||
313 | tp[0] = sbuf.st_atime; /* yes, preserve atime and mtime */ | ||
314 | tp[1] = sbuf.st_mtime; | ||
315 | - utime (file,tp); /* set the times */ | ||
316 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
317 | } | ||
318 | } | ||
319 | } | ||
320 | @@ -999,7 +999,7 @@ long unix_copy (MAILSTREAM *stream,char *sequence,char *mailbox,long options) | ||
321 | else tp[0] = /* else preserve \Marked status */ | ||
322 | ((sbuf.st_ctime > sbuf.st_atime) || (sbuf.st_mtime > sbuf.st_atime)) ? | ||
323 | sbuf.st_atime : tp[1]; | ||
324 | - utime (file,tp); /* set the times */ | ||
325 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
326 | unix_unlock (fd,NIL,&lock); /* unlock and close mailbox */ | ||
327 | if (tstream) { /* update last UID if we can */ | ||
328 | UNIXLOCAL *local = (UNIXLOCAL *) tstream->local; | ||
329 | @@ -1160,7 +1160,7 @@ long unix_append (MAILSTREAM *stream,char *mailbox,append_t af,void *data) | ||
330 | ret = NIL; /* return error */ | ||
331 | } | ||
332 | else tp[0] = tp[1] - 1; /* set atime to now-1 if successful copy */ | ||
333 | - utime (file,tp); /* set the times */ | ||
334 | + utime (file, (const struct utimbuf *)tp); /* set the times */ | ||
335 | fclose (sf); /* done with scratch file */ | ||
336 | /* force UIDVALIDITY assignment now */ | ||
337 | if (tstream && !tstream->uid_validity) tstream->uid_validity = time (0); | ||
338 | @@ -1425,7 +1425,7 @@ void unix_unlock (int fd,MAILSTREAM *stream,DOTLOCK *lock) | ||
339 | } | ||
340 | else now = 0; /* no time change needed */ | ||
341 | /* set the times, note change */ | ||
342 | - if (now && !utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
343 | + if (now && !utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
344 | } | ||
345 | flock (fd,LOCK_UN); /* release flock'ers */ | ||
346 | if (!stream) close (fd); /* close the file if no stream */ | ||
347 | @@ -2251,7 +2251,7 @@ long unix_rewrite (MAILSTREAM *stream,unsigned long *nexp,DOTLOCK *lock, | ||
348 | /* set atime to now, mtime a second earlier */ | ||
349 | tp[1] = (tp[0] = time (0)) - 1; | ||
350 | /* set the times, note change */ | ||
351 | - if (!utime (stream->mailbox,tp)) LOCAL->filetime = tp[1]; | ||
352 | + if (!utime (stream->mailbox, (const struct utimbuf *)tp)) LOCAL->filetime = tp[1]; | ||
353 | close (LOCAL->fd); /* close and reopen file */ | ||
354 | if ((LOCAL->fd = open (stream->mailbox,O_RDWR, | ||
355 | (long) mail_parameters (NIL,GET_MBXPROTECTION,NIL))) | ||
diff --git a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 17faa3aa6..7e3bddb58 100644 --- a/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "https://fossies.org/linux/misc/old/imap-${PV}.tar.gz \ | |||
16 | file://0002-tmail-Include-ctype.h-for-isdigit.patch \ | 16 | file://0002-tmail-Include-ctype.h-for-isdigit.patch \ |
17 | file://0001-Fix-Wincompatible-function-pointer-types.patch \ | 17 | file://0001-Fix-Wincompatible-function-pointer-types.patch \ |
18 | file://uw-imap-newer-tls.patch \ | 18 | file://uw-imap-newer-tls.patch \ |
19 | file://uw-imap-fix-incompatible-pointer-types.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" | 22 | SRC_URI[md5sum] = "2126fd125ea26b73b20f01fcd5940369" |