mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
a9f58dddb7
Update to a more recent stable release. Most notably, this version includes some fixes for building on an OS like Alpine. This allows for the removal of hacks that fixed building on Alpine, but broke building on ARM archs. Manually adjust: - 7-zip-flags.patch - 7-zip-musl.patch Link: https://7-zip.org/history.txt Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15991 Signed-off-by: Robert Marko <robimarko@gmail.com>
37 lines
810 B
Diff
37 lines
810 B
Diff
--- a/C/Threads.c
|
|
+++ b/C/Threads.c
|
|
@@ -265,7 +265,7 @@ WRes Thread_Create_With_CpuSet(CThread *
|
|
*/
|
|
|
|
// ret2 =
|
|
- pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
|
|
+ //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);
|
|
// if (ret2) ret = ret2;
|
|
#endif
|
|
}
|
|
@@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread *
|
|
if (!ret)
|
|
{
|
|
p->_created = 1;
|
|
- /*
|
|
if (cpuSet)
|
|
{
|
|
// ret2 =
|
|
pthread_setaffinity_np(p->_tid, sizeof(*cpuSet), cpuSet);
|
|
// if (ret2) ret = ret2;
|
|
}
|
|
- */
|
|
}
|
|
}
|
|
// ret2 =
|
|
--- a/C/Threads.h
|
|
+++ b/C/Threads.h
|
|
@@ -29,6 +29,7 @@ Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_
|
|
#endif
|
|
|
|
#include <pthread.h>
|
|
+#include <sched.h>
|
|
|
|
#endif
|
|
|