clean up.

This commit is contained in:
uglyside
2025-05-16 13:47:16 +03:00
parent da2615301e
commit b5d817e9a4
4 changed files with 45 additions and 41 deletions
+19 -14
View File
@@ -6,26 +6,31 @@
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
from pisi.actionsapi import cmaketools from pisi.actionsapi import cmaketools
from pisi.actionsapi import mesontools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import get
j = ''.join([ j = "-DCMAKE_INSTALL_PREFIX=/usr \
' -DCMAKE_INSTALL_PREFIX=/usr', -DCMAKE_BUILD_TYPE=Release \
' -DCMAKE_BUILD_TYPE=Release', -DCMAKE_THREAD_LIBS_INIT='-lpthread' \
' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON', -DCMAKE_HAVE_THREADS_LIBRARY=ON \
' -DBUILD_TESTING=OFF', -DCMAKE_USE_PTHREADS_INIT=ON \
' -Bbuild -G Ninja -L ' -DBUILD_TESTING=OFF -LA \
]) "
def setup(): def setup():
shelltools.export("CC", "clang") shelltools.export("CC", "clang")
shelltools.export("CXX", "clang++") shelltools.export("CXX", "clang++")
cmaketools.configure(j) shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure(j, sourceDir = '..')
def build(): def build():
mesontools.build() shelltools.cd("build")
cmaketools.make()
def install(): def install():
mesontools.install() shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("../CONTRIBUTING.md", "../INSTALL.md", "../README.md", "../TESTING.md")
pisitools.dodoc("LICENSE")
@@ -0,0 +1,11 @@
--- tests/dispatch_test.c.orig
+++ tests/dispatch_test.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#include <unistd.h>
-#if __has_include(<sys/event.h>)
+#if __has_include(<sys/event.h>) && !defined(__linux__)
#define HAS_SYS_EVENT_H 1
#include <sys/event.h>
#else
@@ -0,0 +1,10 @@
--- cmake/modules/DispatchCompilerWarnings.cmake.orig 2020-05-12 13:13:59.619689872 +0300
+++ cmake/modules/DispatchCompilerWarnings.cmake 2020-05-12 13:13:35.216171428 +0300
@@ -2,7 +2,6 @@
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
# TODO: someone needs to provide the msvc equivalent warning flags
else()
- add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Werror>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wall>)
add_compile_options($<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:-Wextra>)
+5 -27
View File
@@ -12,17 +12,15 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Grand Central Dispatch.</Summary> <Summary>Grand Central Dispatch.</Summary>
<Description>Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description> <Description>Grand Central Dispatch (GCD or libdispatch) provides comprehensive support for concurrent code execution on multicore hardware.</Description>
<Archive sha1sum="fd6cda567e682bc46cafe91d07fc34c545f610f6" type="targz"> <Archive sha1sum="f25bc698285cfa84bf24bd8bd5ef9103c4668e0a" type="targz">https://github.com/apple/swift-corelibs-libdispatch/archive/swift-5.3-RELEASE.tar.gz</Archive>
https://github.com/swiftlang/swift-corelibs-libdispatch/archive/refs/tags/swift-6.1-RELEASE.tar.gz
</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<Dependency>ninja</Dependency>
<Dependency>llvm-clang</Dependency> <Dependency>llvm-clang</Dependency>
<Dependency>llvm-clang-devel</Dependency> <Dependency>llvm-clang-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch level="1"></Patch> --> <Patch level="0">avoid-libkqueue.patch</Patch>
<Patch level="0">remove-werror.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -33,7 +31,8 @@
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
<Path fileType="data">/usr/share</Path> <Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files> </Files>
</Package> </Package>
@@ -48,27 +47,6 @@
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2025-05-08</Date>
<Version>6.1</Version>
<Comment>Rebuild.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="4">
<Date>2022-11-25</Date>
<Version>5.5</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="3">
<Date>2021-09-12</Date>
<Version>5.4.2</Version>
<Comment>Version bump.</Comment>
<Name>fury</Name>
<Email>uglyside@yandex.ru</Email>
</Update>
<Update release="2"> <Update release="2">
<Date>2021-02-24</Date> <Date>2021-02-24</Date>
<Version>5.3</Version> <Version>5.3</Version>