2021-05-29 06:49:19 +02:00
|
|
|
Index: cmake/FindWrapAtomic.cmake
|
|
|
|
|
===================================================================
|
srcpkgs/q*: convert patches to -Np1
* par is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/cmake/FindWrapAtomic.cmake
|
|
|
|
|
+++ b/cmake/FindWrapAtomic.cmake
|
2021-05-29 06:49:19 +02:00
|
|
|
@@ -38,7 +38,8 @@ endif()
|
|
|
|
|
|
|
|
|
|
add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
|
|
|
|
|
if(HAVE_STDATOMIC_WITH_LIB)
|
|
|
|
|
- target_link_libraries(WrapAtomic::WrapAtomic INTERFACE atomic)
|
|
|
|
|
+ find_library(LIBATOMIC atomic REQUIRED)
|
|
|
|
|
+ target_link_libraries(WrapAtomic::WrapAtomic INTERFACE ${LIBATOMIC})
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
set(WrapAtomic_FOUND 1)
|
