diff --git a/srcpkgs/ART/template b/srcpkgs/ART/template index a15bf7a9bdd..a86a304711e 100644 --- a/srcpkgs/ART/template +++ b/srcpkgs/ART/template @@ -4,7 +4,7 @@ version=1.13 revision=2 build_style=cmake hostmakedepends="pkg-config" -makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel +makedepends="fftw-devel gtkmm-devel lensfun-devel libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel exiv2-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Fork of RawTherapee with additional features" diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index 671c74ca645..3744c3cc652 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -27,7 +27,6 @@ desc_option_fftw="Enable support for rendering of audio waveforms/spectrum" desc_option_openal="Enable support for openal" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index c383f7b3133..3f055ca1c8a 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -34,10 +34,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then export LDFLAGS="-lfts" fi -if [ "$XBPS_NO_ATOMIC8" ]; then - hostmakedepends+=" libatomic-devel" -fi - post_patch() { if [ "$CROSS_BUILD" ]; then vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \ diff --git a/srcpkgs/Clipboard/template b/srcpkgs/Clipboard/template index d6bb7e23f69..c33fb45eb94 100644 --- a/srcpkgs/Clipboard/template +++ b/srcpkgs/Clipboard/template @@ -14,7 +14,6 @@ distfiles="https://github.com/Slackadays/Clipboard/archive/refs/tags/${version}. checksum=f7ceb2dbb76bc094ac8afbef97bdef0f1a9451ca7dd1a4a181f3b2a859a2f094 if [ "${XBPS_TARGET_NO_ATOMIC8}" ]; then - makedepends+=" libatomic-devel" CXXFLAGS+=" -latomic" fi diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template index e5e26088e7f..c224fc1379b 100644 --- a/srcpkgs/CubicSDR/template +++ b/srcpkgs/CubicSDR/template @@ -20,6 +20,5 @@ build_options="alsa pulseaudio jack" build_options_default="alsa pulseaudio" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DOTHER_LIBRARIES=atomic" fi diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template index 156eab6ce47..e738148fbe3 100644 --- a/srcpkgs/EternalTerminal/template +++ b/srcpkgs/EternalTerminal/template @@ -33,10 +33,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { mv EternalTerminal-et-v${version} ${build_wrksrc} mv sanitizers-cmake-${_sanitizers_gitrev}/* \ diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template index ee2059a373b..13d2ef286e2 100644 --- a/srcpkgs/FreeRADIUS/template +++ b/srcpkgs/FreeRADIUS/template @@ -15,10 +15,6 @@ nocross=yes # Not supported by upstream system_accounts="_freeradius" make_dirs="/etc/raddb 0750 _freeradius _freeradius" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_install() { # FreeRADIUS uses 'R' instead of 'DESTDIR' export R=${DESTDIR} diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 37bb3b97359..e749d635c5c 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -19,10 +19,6 @@ checksum=01c9556287d5f49662c2219365b9d306482e8efadc805c3dbb9381d5110df719 build_options="qt" desc_option_qt="Include QT WebEngine to support solving captchas" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" fi diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template index 25a49c5ad71..fe963be85f8 100644 --- a/srcpkgs/LimeSuite/template +++ b/srcpkgs/LimeSuite/template @@ -45,10 +45,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="octave" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { vinstall udev-rules/64-limesuite.rules 644 usr/lib/udev/rules.d diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template index e4e0e2ee13f..cd0dfaf6d5a 100644 --- a/srcpkgs/MEGAcmd/template +++ b/srcpkgs/MEGAcmd/template @@ -18,7 +18,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index ceb69d829a3..5866e44d12d 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -77,7 +77,6 @@ if [ "$XBPS_CHECK_PKGS" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template index ffc64637bd4..1ee7eead6df 100644 --- a/srcpkgs/OpenSubdiv/template +++ b/srcpkgs/OpenSubdiv/template @@ -21,7 +21,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template index 850df9d418b..00a55417659 100644 --- a/srcpkgs/QMPlay2/template +++ b/srcpkgs/QMPlay2/template @@ -17,7 +17,6 @@ distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPla checksum=dc57afc6e3299701508e5dbffa486d7956d6764420dcc0f22a0da8f7d07a2137 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template index 3490f6f3fa7..73dabfa8950 100644 --- a/srcpkgs/SuiteSparse/template +++ b/srcpkgs/SuiteSparse/template @@ -23,10 +23,6 @@ case "$XBPS_TARGET_MACHINE" in *) ;; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - do_build() { make library \ JOBS=$XBPS_MAKEJOBS \ diff --git a/srcpkgs/abseil-cpp/template b/srcpkgs/abseil-cpp/template index ea2fa250687..5fe16466deb 100644 --- a/srcpkgs/abseil-cpp/template +++ b/srcpkgs/abseil-cpp/template @@ -5,7 +5,6 @@ revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DABSL_PROPAGATE_CXX_STD=ON" hostmakedepends="pkg-config" -makedepends="libatomic-devel" short_desc="Abseil common libraries" maintainer="Andrew J. Hesford " license="Apache-2.0" diff --git a/srcpkgs/ahoviewer/template b/srcpkgs/ahoviewer/template index 27aa75d2589..ebe27060b42 100644 --- a/srcpkgs/ahoviewer/template +++ b/srcpkgs/ahoviewer/template @@ -17,10 +17,6 @@ distfiles="${homepage}/archive/${version}.tar.gz" checksum=a14e32b4a8095c9f8b4b607c090a50cc8ac1076550e57b5a9303c54089068152 nocross="https://travis-ci.org/void-linux/void-packages/jobs/490108528#L1022" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_patch() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then echo "ahoviewer_LDADD += -latomic" >> src/Makefile.am diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index b38d9fe0d6a..9be306794db 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -20,10 +20,6 @@ homepage="https://community.kde.org/KDE_PIM/Akonadi" distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz" checksum=5e91b86e895263b76d6f1f00cd9fcd8399d5a6c293581e629ab310fc72dfa6a9 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -e "s;^\(target_link_libraries(.*\);\1 atomic;" -i src/server/CMakeLists.txt diff --git a/srcpkgs/alembic/template b/srcpkgs/alembic/template index 53ff7d48719..1fbc7b13fab 100644 --- a/srcpkgs/alembic/template +++ b/srcpkgs/alembic/template @@ -18,13 +18,11 @@ case "$XBPS_TARGET_MACHINE" in ppc*) broken="undefined reference to '__sync_bool_compare_and_swap_8'";; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" - - post_patch() { +post_patch() { + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then printf '\ntarget_link_libraries(Alembic PRIVATE atomic)\n' >> lib/Alembic/CMakeLists.txt - } -fi + fi +} post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index b813474eace..54012fa5e79 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -16,7 +16,6 @@ distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/a checksum=60234ecbca19a17a7e2f46a4581960d645b7c55b870d924a21494c76a6f548ec if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index f1cd4363365..17a94361cd3 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -23,7 +23,6 @@ checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b make_check=no if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template index 6fb1fefd4f6..e546186592b 100644 --- a/srcpkgs/apr/template +++ b/srcpkgs/apr/template @@ -25,7 +25,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 7be9652eccf..853e16fcad3 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -46,7 +46,6 @@ if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CFLAGS="-latomic" fi diff --git a/srcpkgs/ardour/template b/srcpkgs/ardour/template index f45d263565b..ab16f26eedf 100644 --- a/srcpkgs/ardour/template +++ b/srcpkgs/ardour/template @@ -24,7 +24,6 @@ export PATH="/usr/libexec/chroot-git:$PATH" conf_files="/etc/ardour7/*" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/audacity/template b/srcpkgs/audacity/template index d509c0a8940..28e9c4a3528 100644 --- a/srcpkgs/audacity/template +++ b/srcpkgs/audacity/template @@ -24,7 +24,6 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index 1be957d9ed6..a3d2f1da2d8 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -17,9 +17,6 @@ checksum=a40d04d2c48135972cecb6578405e835c4b9d798c0950017de0fad40ca94e8a0 alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-sqlite3-${version}.so" shlib_provides="libbaccats-${version}.so" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi CFLAGS="-Wno-narrowing" post_install() { diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index ecedbd8e4be..d613acc78be 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -15,10 +15,6 @@ distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src- checksum=65adcaf4cee17fa3a94d0bb96d3691ca7e5864244e7bd52df93f7ae6c004f23d python_version="3" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { sed -i '/tests/d' CMakeLists.txt # break on musl sed -i 's///' examples/cpp/KModRetExample.cc diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template index 5296bf79913..423d9187e60 100644 --- a/srcpkgs/bees/template +++ b/srcpkgs/bees/template @@ -23,7 +23,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CXXFLAGS+=" -latomic" fi diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 54493e5d9cf..ac720ac0e1b 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -10,7 +10,7 @@ configure_args="--disable-static --enable-largefile --with-libtool --with-libidn2 --disable-backtrace" hostmakedepends="automake libtool perl pkg-config" makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel - libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)" + libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)" checkdepends="python3-pytest" short_desc="Berkeley Internet Name Domain server" maintainer="Randy McCaskill " diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template index f8cb9a31c2d..911af80be28 100644 --- a/srcpkgs/cabbage/template +++ b/srcpkgs/cabbage/template @@ -31,7 +31,6 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS=" -latomic" fi diff --git a/srcpkgs/capnproto/template b/srcpkgs/capnproto/template index 5ab6e0a62cd..77652040538 100644 --- a/srcpkgs/capnproto/template +++ b/srcpkgs/capnproto/template @@ -16,7 +16,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index bd6a537d7cb..dd8d1e704ab 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -20,10 +20,6 @@ if [ -n "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DENABLE_TESTING=ON" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { mv ccache-${version}/* . } diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template index ecc9f3e38a5..ec0597c9f6d 100644 --- a/srcpkgs/ccls/template +++ b/srcpkgs/ccls/template @@ -13,6 +13,5 @@ distfiles="https://github.com/MaskRay/ccls/archive/${version}.tar.gz" checksum=af19be36597c2a38b526ce7138c72a64c7fb63827830c4cff92256151fc7a6f4 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/cereal/template b/srcpkgs/cereal/template index 32644ae3f39..a790d1f42b1 100644 --- a/srcpkgs/cereal/template +++ b/srcpkgs/cereal/template @@ -13,7 +13,6 @@ distfiles="https://github.com/USCiLab/cereal/archive/v${version}.tar.gz" checksum=16a7ad9b31ba5880dac55d62b5d6f243c3ebc8d46a3514149e56b5e7ea81f85f if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index 977fa977149..32454a86e9d 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -34,7 +34,6 @@ checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LIBS="-latomic" fi diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 3eb657ab23d..da966f53037 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -7,13 +7,13 @@ archs="i686* x86_64* aarch64* armv7l*" hostmakedepends=" $(vopt_if clang "clang lld llvm15") bison git gperf hwids ninja nodejs perl pkg-config python3 - libatomic-devel libepoxy-devel libevent-devel libglib-devel + libepoxy-devel libevent-devel libglib-devel rust" makedepends=" alsa-lib-devel libdav1d-devel brotli-devel cups-devel elfutils-devel ffmpeg-devel fontconfig-devel freetype-devel gtk+3-devel jsoncpp-devel libXScrnSaver-devel libXcomposite-devel libXcursor-devel libXdamage-devel libXi-devel libXrandr-devel - libatomic-devel libavif-devel libcap-devel libcurl-devel libdrm-devel libevent-devel + libavif-devel libcap-devel libcurl-devel libdrm-devel libevent-devel libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index b0fafe6603f..46bf5cb6051 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -23,7 +23,6 @@ checksum=212fa302f15ea955af6dc87fdba3898f751d078df91cb84b0e6615d5a2b84e15 make_check=extended if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 0fcb424ce33..0fdcec461c2 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -21,7 +21,6 @@ build_options_default="elogind" desc_option_elogind="Support MPRIS interface via elogind" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" export LDLIBS+=" -latomic" fi diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template index 2f44e9d0f2e..1ab7a0df0d4 100644 --- a/srcpkgs/conduit/template +++ b/srcpkgs/conduit/template @@ -20,7 +20,6 @@ make_dirs="/var/lib/conduit 0700 _conduit _conduit /etc/conduit 755 _conduit _conduit" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" XBPS_CROSS_RUSTFLAGS+=" -latomic" fi diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template index b85385804fa..da0523eafb7 100644 --- a/srcpkgs/corectrl/template +++ b/srcpkgs/corectrl/template @@ -17,6 +17,5 @@ distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz" checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LIBS="-latomic" fi diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template index ca3423ce883..dee0043b9e6 100644 --- a/srcpkgs/dhcp/template +++ b/srcpkgs/dhcp/template @@ -11,10 +11,6 @@ homepage="https://www.isc.org/downloads/dhcp" distfiles="http://ftp.isc.org/isc/dhcp/${version/P/-P}/dhcp-${version/P/-P}.tar.gz" checksum=b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - disable_parallel_build=yes conf_files="/etc/dhcpd.conf" diff --git a/srcpkgs/difftastic/template b/srcpkgs/difftastic/template index 2182ece1b6a..769301f7b41 100644 --- a/srcpkgs/difftastic/template +++ b/srcpkgs/difftastic/template @@ -12,7 +12,6 @@ distfiles="https://static.crates.io/crates/difftastic/difftastic-${version}.crat checksum=ff0b1d205396b2eb156bd56b4f361767c13a02a14db1b0c8c663e4ff16160f17 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" XBPS_CROSS_RUSTFLAGS+=" -latomic" if [ -z "$CROSS_BUILD" ]; then broken="how is this supposed to even work" diff --git a/srcpkgs/digikam/template b/srcpkgs/digikam/template index 5c98ed64aad..1cee24f3b60 100644 --- a/srcpkgs/digikam/template +++ b/srcpkgs/digikam/template @@ -35,7 +35,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/dosbox-staging/template b/srcpkgs/dosbox-staging/template index 202f6a6911e..f5483acab28 100644 --- a/srcpkgs/dosbox-staging/template +++ b/srcpkgs/dosbox-staging/template @@ -18,6 +18,5 @@ checksum=2ca69e65e6c181197b63388c60487a3bcea804232a28c44c37704e70d49a0392 conflicts="dosbox" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/duperemove/template b/srcpkgs/duperemove/template index d5ed8bea29f..03e02859cf6 100644 --- a/srcpkgs/duperemove/template +++ b/srcpkgs/duperemove/template @@ -3,7 +3,7 @@ pkgname=duperemove version=0.11.2 revision=1 hostmakedepends="pkg-config" -makedepends="sqlite-devel libglib-devel libgcrypt-devel libatomic-devel" +makedepends="sqlite-devel libglib-devel libgcrypt-devel" short_desc="Tools for deduping file systems" maintainer="Enno Boland " license="GPL-2.0-only" diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template index f5f78af4785..947241eab26 100644 --- a/srcpkgs/edbrowse/template +++ b/srcpkgs/edbrowse/template @@ -17,7 +17,6 @@ distfiles="https://github.com/CMB/edbrowse/archive/v${version}.tar.gz" checksum=2c7f6a07e5897060527b6cc5c19c45106444e2c4d8c9799434973c352d9ce4e6 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" make_build_args+=" QUICKJS_LDFLAGS+=-latomic" fi diff --git a/srcpkgs/electron19/template b/srcpkgs/electron19/template index 32ce301e730..30932485884 100644 --- a/srcpkgs/electron19/template +++ b/srcpkgs/electron19/template @@ -9,7 +9,7 @@ create_wrksrc=yes build_wrksrc="src" hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel - pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel + pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sndio sndio-devel) jq" @@ -21,7 +21,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel - re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel + re2-devel fontconfig-devel freetype-devel opus-devel $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel" short_desc="Cross platform application framework based on web technologies" diff --git a/srcpkgs/electron24/template b/srcpkgs/electron24/template index bdaa56adc8a..431ba6b0f83 100644 --- a/srcpkgs/electron24/template +++ b/srcpkgs/electron24/template @@ -9,7 +9,7 @@ create_wrksrc=yes build_wrksrc="src" hostmakedepends="$(vopt_if clang "clang lld") python pkgconf perl gperf bison ninja nodejs hwids libwebp-devel freetype-devel harfbuzz-devel libpng-devel nss-devel which git libevent-devel - pciutils-devel libatomic-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel + pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk libxslt-devel opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if sndio sndio-devel) jq" @@ -21,7 +21,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel - re2-devel fontconfig-devel freetype-devel opus-devel libffi-devel libatomic-devel + re2-devel fontconfig-devel freetype-devel opus-devel libffi-devel $(vopt_if sndio sndio-devel) ffmpeg-devel libva-devel libuv-devel c-ares-devel libnotify-devel $(vopt_if pipewire pipewire-devel) wayland-devel libcurl-devel libxshmfence-devel" short_desc="Cross platform application framework based on web technologies" diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index d041dace80d..e3fb3539f65 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -19,7 +19,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/fairy-stockfish/template b/srcpkgs/fairy-stockfish/template index e8df08b5afc..7a3c512bc43 100644 --- a/srcpkgs/fairy-stockfish/template +++ b/srcpkgs/fairy-stockfish/template @@ -36,7 +36,6 @@ case $XBPS_TARGET_MACHINE in esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index aa058aab9ca..ae26496e792 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -51,10 +51,6 @@ if [ "$XBPS_TARGET_WORDSIZE" != "32" ]; then build_options_default+=" svtav1" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - _apply_patch() { local args="$1" pname="$(basename $2)" diff --git a/srcpkgs/ffms2/template b/srcpkgs/ffms2/template index 68e8a0c14bc..bfeb9698ceb 100644 --- a/srcpkgs/ffms2/template +++ b/srcpkgs/ffms2/template @@ -14,7 +14,6 @@ distfiles="${homepage}/archive/${version}.tar.gz" checksum=82e95662946f3d6e1b529eadbd72bed196adfbc41368b2d50493efce6e716320 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index a8d1338d37e..c8d7feab7b4 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -21,10 +21,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) CFLAGS="-msse2";; esac diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template index 663bf2b08e3..5ca1157055e 100644 --- a/srcpkgs/fio/template +++ b/srcpkgs/fio/template @@ -20,7 +20,6 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" export LIBS=-latomic fi diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 4d55e3ad54e..2ddcc411b92 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -21,7 +21,7 @@ hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std - libXdamage-devel freetype-devel libatomic-devel + libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)" diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index d29d5181a88..875ca485801 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -21,7 +21,7 @@ hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std - libXdamage-devel freetype-devel libatomic-devel + libXdamage-devel freetype-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)" diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index 60f0f934124..c5030d7b8d6 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -17,10 +17,6 @@ register_shell="/bin/fish /usr/bin/fish" # tests don't work as root make_check=ci-skip -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { # Starting with fish-3.0.0 this is a skeleton file with only comments rm "${DESTDIR}/etc/fish/config.fish" diff --git a/srcpkgs/fplll/template b/srcpkgs/fplll/template index c53eee819b7..9843d468284 100644 --- a/srcpkgs/fplll/template +++ b/srcpkgs/fplll/template @@ -12,10 +12,6 @@ changelog="https://github.com/fplll/fplll/releases" distfiles="https://github.com/fplll/fplll/releases/download/${version}/fplll-${version}.tar.gz" checksum=0fd9d378f04ff886d8864728baf5d90b8b0b82c1e541e92550644fb54f75691d -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - fplll-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template index 2aa8aa8bf43..492c4b11d27 100644 --- a/srcpkgs/fselect/template +++ b/srcpkgs/fselect/template @@ -19,7 +19,6 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" XBPS_CROSS_RUSTFLAGS+=" -latomic" fi diff --git a/srcpkgs/fswatch/template b/srcpkgs/fswatch/template index dfb86f72581..d2f0039c6c3 100644 --- a/srcpkgs/fswatch/template +++ b/srcpkgs/fswatch/template @@ -14,7 +14,6 @@ distfiles="https://github.com/emcrisostomo/fswatch/releases/download/${version}/ checksum=c38e341c567f5f16bfa64b72fc48bba5e93873d8572522e670e6f320bbc2122f if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" export LIBS=-latomic fi diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template index 5f73484a3fb..d7494a6ff50 100644 --- a/srcpkgs/geonkick/template +++ b/srcpkgs/geonkick/template @@ -19,6 +19,5 @@ if [ ${CROSS_BUILD} ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'" fi diff --git a/srcpkgs/giada/template b/srcpkgs/giada/template index 558097e3a0e..a7ac263ce2f 100644 --- a/srcpkgs/giada/template +++ b/srcpkgs/giada/template @@ -16,10 +16,6 @@ changelog="https://github.com/monocasual/giada/raw/master/ChangeLog" distfiles="https://github.com/monocasual/giada/archive/v${version}.tar.gz" checksum=b879f5ba7e9f34d7422aedd89d1d0baa91387b3528e057b4df25e1f2f8d661ef -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -e '/list(APPEND LIBRARIES)/a list(APPEND LIBRARIES atomic)' -i CMakeLists.txt diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 8e8698e3388..3794571631f 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -18,10 +18,6 @@ distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz" checksum=a63f156964b136053eab51ea013114e7d7c193b7518d28c040b6b02c3c933a6d make_check_pre="xvfb-run" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - if [ "$XBPS_CHECK_PKGS" ]; then hostmakedepends+=" dbus" else diff --git a/srcpkgs/glirc/template b/srcpkgs/glirc/template index 98a677886ae..da205ec9810 100644 --- a/srcpkgs/glirc/template +++ b/srcpkgs/glirc/template @@ -16,7 +16,6 @@ nopie=yes # ghc is currently built without PIE support _cabal_opts="-g" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" _cabal_opts+=" --ghc-option -latomic" fi diff --git a/srcpkgs/glog/template b/srcpkgs/glog/template index 441a149514f..07d7137bc77 100644 --- a/srcpkgs/glog/template +++ b/srcpkgs/glog/template @@ -18,7 +18,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'" fi diff --git a/srcpkgs/glslViewer/template b/srcpkgs/glslViewer/template index e832b3df7b7..72707d14294 100644 --- a/srcpkgs/glslViewer/template +++ b/srcpkgs/glslViewer/template @@ -18,10 +18,6 @@ distfiles="https://github.com/patriciogonzalezvivo/glslViewer/archive/${version} checksum="4d8bac6a801fa61b81e472a8dabfe5469a43c44547d558849a078ed2c26c8034 a71f149e84afdf12aa88555efef09d0e420c5d5c6ba9c2d67126ecc49fddaff0" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { mv ${pkgname}-${version} ${build_wrksrc} mv vera-${_vera_gitrev}/* ${build_wrksrc}/deps/vera diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template index a8a6dabe66b..1387a3cf6b3 100644 --- a/srcpkgs/gnunet/template +++ b/srcpkgs/gnunet/template @@ -36,10 +36,6 @@ desc_option_jansson="Enable support for jansson" desc_option_opus="Enable support for opus" desc_option_zbar="Enable support for zbar" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { NOCONFIGURE=1 autoreconf -fi } diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 3308afa6e2c..be803231f80 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -35,7 +35,6 @@ if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template index 636dd5f66a7..79268eaf8c1 100644 --- a/srcpkgs/goxel/template +++ b/srcpkgs/goxel/template @@ -13,10 +13,6 @@ homepage="https://guillaumechereau.github.io/goxel/" distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz" checksum=e3825625e1af9f58593695b0129e39f68a8f3c7d5696c096b8ed2d8b9ac69430 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_build() { if [ "$CROSS_BUILD" ];then vsed -i SConstruct \ diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index 9c58c2509be..f5afad92794 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -24,7 +24,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index 781616f36a9..8991a8a415c 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -27,7 +27,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 635755fe417..c6578e0fc1d 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}" hostmakedepends="lua53-devel" -makedepends="libatomic-devel openssl-devel lua53-devel pcre2-devel" +makedepends="openssl-devel lua53-devel pcre2-devel" checkdepends="curl varnish" short_desc="Reliable, high performance TCP/HTTP load balancer" maintainer="Zach Dykstra " diff --git a/srcpkgs/hedgewars/template b/srcpkgs/hedgewars/template index 419f29b98b4..15a1df6d886 100644 --- a/srcpkgs/hedgewars/template +++ b/srcpkgs/hedgewars/template @@ -35,8 +35,8 @@ case $XBPS_TARGET_MACHINE in esac if [ -n "$_use_c_engine" ]; then - hostmakedepends+=" glew-devel libatomic-devel ghc clang" - makedepends+=" glew-devel libatomic-devel" + hostmakedepends+=" glew-devel ghc clang" + makedepends+=" glew-devel" configure_args+=" -DBUILD_ENGINE_C=1" nopie_files+=" /usr/bin/hedgewars" fi diff --git a/srcpkgs/highway/template b/srcpkgs/highway/template index 47c51ec1d61..4d6898b62c7 100644 --- a/srcpkgs/highway/template +++ b/srcpkgs/highway/template @@ -4,7 +4,6 @@ version=1.0.4 revision=1 build_style=cmake configure_args="-DHWY_SYSTEM_GTEST=ON -DHWY_ENABLE_EXAMPLES=OFF" -makedepends="libatomic-devel" checkdepends="gtest-devel" short_desc="C++ library providing portable SIMD/vector intrinsics" maintainer="Joshua Krämer " diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index f4e21928b9d..8cfa4dd9a49 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -4,8 +4,7 @@ version=2.48.0 revision=1 build_style=gnu-makefile make_build_args="USE_UPNP=yes" -makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel - libatomic-devel" +makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel" short_desc="Full-featured C++ implementation of I2P client" maintainer="Orphaned " license="BSD-3-Clause" diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index aa1ab218a44..49633b61fd8 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -24,10 +24,6 @@ distfiles="https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar. checksum=a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4 python_version=3 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_patch() { if [ "$XBPS_TARGET_LIBC" = musl ]; then # disable errors for missing sentinels in glib variadic functions, diff --git a/srcpkgs/jack_capture/template b/srcpkgs/jack_capture/template index 5b604fdb2ed..b5c59179d8d 100644 --- a/srcpkgs/jack_capture/template +++ b/srcpkgs/jack_capture/template @@ -14,7 +14,6 @@ checksum=21afb0257ed7437708cc9e5bec2f6299599461b7eec8bf66967d8ecadb0751de CFLAGS+=" -D__USE_GNU" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/kdiff3/template b/srcpkgs/kdiff3/template index 7ca6d77c9de..439abb79083 100644 --- a/srcpkgs/kdiff3/template +++ b/srcpkgs/kdiff3/template @@ -19,6 +19,5 @@ case "$XBPS_TARGET_MACHINE" in esac if [ $XBPS_TARGET_NO_ATOMIC8 ]; then - makedepends+=" libatomic-devel" configure_args=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template index 46cbf7b3181..5ede09fb775 100644 --- a/srcpkgs/kismet/template +++ b/srcpkgs/kismet/template @@ -20,6 +20,5 @@ checksum=2149cceac5526508653f4d02dcf7a694e3da3dc000a2372a1ee4bf9988279781 system_groups="kismet" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" export LIBS="-latomic" fi diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template index 6534f59384a..4b8fa31866d 100644 --- a/srcpkgs/kiwix-lib/template +++ b/srcpkgs/kiwix-lib/template @@ -14,10 +14,6 @@ changelog="https://github.com/kiwix/kiwix-lib/blob/${version}/ChangeLog" distfiles="https://sources.voidlinux-ppc.org/kiwix-lib-${version}/${version}.tar.gz" checksum=f76bfa90411c52d4d8c49ac5767928fc28d01ef26916d72df4856cf08b064202 -if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then - makedepends+=" libatomic-devel" -fi - kiwix-lib-devel_package() { short_desc+=" - development packages" depends="pugixml-devel icu-devel xapian-core-devel libzim-devel diff --git a/srcpkgs/kiwix-tools/template b/srcpkgs/kiwix-tools/template index e9f0841b61a..300aba74fec 100644 --- a/srcpkgs/kiwix-tools/template +++ b/srcpkgs/kiwix-tools/template @@ -13,10 +13,6 @@ changelog="https://github.com/kiwix/kiwix-tools/blob/${version}/Changelog" distfiles="https://github.com/kiwix/kiwix-tools/archive/${version}.tar.gz" checksum=86325ec31976d40357f08c520806cf223fa1b0a5edb02ad106c2a0d6746ca364 -if [ "$XBPS_TARGET_NO_ATOMIC8" ] || [ "${XBPS_TARGET_MACHINE/-musl/}" = "armv7l" ]; then - makedepends+=" libatomic-devel" -fi - if [ "$CROSS_BUILD" ]; then hostmakedepends+=" kiwix-lib-devel" fi diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template index 1dcfd1d8338..6c3b334e859 100644 --- a/srcpkgs/kjsembed/template +++ b/srcpkgs/kjsembed/template @@ -16,10 +16,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - kjsembed-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 8057964d78a..bd5433969db 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -96,7 +96,6 @@ else fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 8280590f39e..42078351716 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -32,10 +32,6 @@ case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) makedepends+=" vc";; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { # CMake won't search in those directories because of CMAKE_FIND_ROOT_PATH if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template index 49bc5f603ed..0f287825f7a 100644 --- a/srcpkgs/kross/template +++ b/srcpkgs/kross/template @@ -15,10 +15,6 @@ homepage="https://invent.kde.org/frameworks/kross" distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz" checksum=3f0eac7ceaf22fae6202efb66b73e192b781e5733566cbf3362d82be8e8cbe8e -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - kross-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index c530ec5ea57..91a11769957 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -13,8 +13,7 @@ makedepends="plasma-framework-devel kcmutils-devel knewstuff-devel kscreenlocker-devel kinit-devel xcb-util-cursor-devel qt5-multimedia-devel kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel libICE-devel xcb-util-wm-devel qt5-sensors-devel lcms2-devel - pipewire-devel krunner-devel xorg-server-xwayland libxcvt-devel hwids - libatomic-devel" + pipewire-devel krunner-devel xorg-server-xwayland libxcvt-devel hwids" depends="breeze hicolor-icon-theme kinit qt5-core>=5.15.2<5.16.0 hwids libcap-progs" short_desc="KDE Window manager" diff --git a/srcpkgs/lc0/template b/srcpkgs/lc0/template index 9e419aa9968..01ad362471c 100644 --- a/srcpkgs/lc0/template +++ b/srcpkgs/lc0/template @@ -27,10 +27,6 @@ if [ "$CROSS_BUILD" ] && [ "$build_option_openblas" ]; then configure_args+=" -Dopenblas_include=${XBPS_CROSS_BASE}/usr/include/openblas/" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - case "$XBPS_TARGET_MACHINE" in ppc*) export CXXFLAGS+=" -DNO_WARN_X86_INTRINSICS";; esac diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template index 4c6f15150f4..06b6c903657 100644 --- a/srcpkgs/libdex/template +++ b/srcpkgs/libdex/template @@ -10,7 +10,7 @@ configure_args="-Dexamples=false $(vopt_bool vala vapi)" hostmakedepends="pkg-config glib-devel gettext $(vopt_if vala vala) $(vopt_if gtk_doc gi-docgen)" -makedepends="glib-devel libgirepository-devel libatomic-devel +makedepends="glib-devel libgirepository-devel liburing-devel $(vopt_if vala 'vala vala-devel')" short_desc="Future-based programming for GLib-based applications" maintainer="oreo639 " diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template index 3f14afac2e5..ada549cb23f 100644 --- a/srcpkgs/libfilezilla/template +++ b/srcpkgs/libfilezilla/template @@ -16,7 +16,6 @@ distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${versio checksum=2a8f57a06b52f6413b47d6a5dfbe7e9e31c84cc0784076f2f7e395232b0bd461 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/libjxl/template b/srcpkgs/libjxl/template index 8aa7c970acc..a32e13469a2 100644 --- a/srcpkgs/libjxl/template +++ b/srcpkgs/libjxl/template @@ -26,7 +26,6 @@ checksum="c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 skip_extraction="skcms-${_skcms_hash}.tar.gz" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LIBS="-latomic" fi diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template index aa04d722124..38e9cb9d52c 100644 --- a/srcpkgs/libogre/template +++ b/srcpkgs/libogre/template @@ -8,7 +8,7 @@ configure_args="-DOGRE_INSTALL_SAMPLES=TRUE -DOGRE_INSTALL_DOCS=TRUE make_build_target="all OgreDoc" hostmakedepends="pkg-config graphviz doxygen dejavu-fonts-ttf" makedepends="boost-devel freetype-devel libXaw-devel libXrandr-devel - MesaLib-devel zziplib-devel libcppunit-devel glu-devel libatomic-devel + MesaLib-devel zziplib-devel libcppunit-devel glu-devel freeimage-devel pugixml-devel python3-devel" short_desc="Scene-oriented, flexible 3D engine" maintainer="Enno Boland " diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template index 99ed64a757f..deeb6fae494 100644 --- a/srcpkgs/libopenshot-audio/template +++ b/srcpkgs/libopenshot-audio/template @@ -14,7 +14,6 @@ distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar checksum=007ba6ee812a58506341dd66055dba575b3907e5274a0e7416f99c2fbb80021c if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CXXFLAGS+=" -latomic " fi diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index b58d978095d..9258c184247 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -16,7 +16,6 @@ distfiles="https://code.videolan.org/videolan/libplacebo/-/archive/v${version}/l checksum=7b3c857934ee3d30f743e43d7f0606e10950806661ea0ea385f8a1f06cbab854 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index bf5d7af3919..35c83414aca 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -170,10 +170,6 @@ case "$XBPS_TARGET_MACHINE" in ;; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - CXXFLAGS+=" -DGLM_ENABLE_EXPERIMENTAL -DU_USING_ICU_NAMESPACE=1" # Move files listed in a _list.txt into $PKGDESTDIR diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template index a54fe851dec..68f7106dfeb 100644 --- a/srcpkgs/libtd/template +++ b/srcpkgs/libtd/template @@ -19,7 +19,6 @@ fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" - makedepends+=" libatomic-devel" fi pre_configure() { diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index b34c92df1ee..29723939108 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -19,10 +19,6 @@ CXXFLAGS="-std=c++14" # TODO: The test_resume failed in CI for i686 but passed with xbps-uunshare -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -i CMakeLists.txt -e "s;Threads::Threads;& atomic;" @@ -51,9 +47,6 @@ libtorrent-rasterbar-python3_package() { libtorrent-rasterbar-devel_package() { depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel" - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - depends+=" libatomic-devel" - fi short_desc+=" - development files" pkg_install() { vmove usr/include diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template index aea0b43cf57..86e86bb96c6 100644 --- a/srcpkgs/llvm12/template +++ b/srcpkgs/llvm12/template @@ -27,7 +27,7 @@ configure_args=" hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx python3-recommonmark python3-sphinx-automodapi" makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel - libxml2-devel binutils-devel libatomic-devel" + libxml2-devel binutils-devel" depends="libllvm12>=${version}_${revision}" short_desc="Low Level Virtual Machine" maintainer="Orphaned " diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template index 7eaadb18b9d..81571270b03 100644 --- a/srcpkgs/llvm15/template +++ b/srcpkgs/llvm15/template @@ -32,7 +32,7 @@ configure_args=" hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx python3-recommonmark python3-sphinx-automodapi" makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel - libxml2-devel binutils-devel libatomic-devel" + libxml2-devel binutils-devel" depends="libllvm15>=${version}_${revision}" short_desc="Low Level Virtual Machine" maintainer="Orphaned " diff --git a/srcpkgs/lms/template b/srcpkgs/lms/template index d20ae1ec1fc..2df52c51dbf 100644 --- a/srcpkgs/lms/template +++ b/srcpkgs/lms/template @@ -18,7 +18,6 @@ _lms_homedir="/var/lms" make_dirs="/var/lms 755 _lms _lms" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_FLAGS=-latomic" fi diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 95e5eeb77d5..f8987e06ed1 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -19,7 +19,7 @@ configure_args="-DBUILD_CONFIG=mysql_release -DWITH_READLINE=ON -DWITH_SYSTEMD=no -DWITH_PCRE=system" hostmakedepends="bison perl flex pkg-config" makedepends="ncurses-devel gnutls-devel libaio-devel boost-devel pam-devel zlib-devel - pcre2-devel libatomic-devel" + pcre2-devel" depends="perl" checkdepends="perl" short_desc="Fast SQL database server, drop-in replacement for MySQL" @@ -83,7 +83,7 @@ libmariadbclient_package() { } libmariadbclient-devel_package() { - depends="libmariadbclient>=${version}_${revision} libatomic-devel" + depends="libmariadbclient>=${version}_${revision}" provides="libmysqlclient-devel-${version}_${revision}" replaces="libmysqlclient-devel>=0" short_desc+=" - client development files" diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index b07f38864ea..df788fe3b0f 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -11,7 +11,7 @@ configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang $(vopt_if wayland 'wayland-protocols wayland-devel')" makedepends="elfutils-devel expat-devel libXdamage-devel - libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel + libXxf86vm-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel diff --git a/srcpkgs/mgba/template b/srcpkgs/mgba/template index ae0504311ee..4af085188bf 100644 --- a/srcpkgs/mgba/template +++ b/srcpkgs/mgba/template @@ -15,7 +15,6 @@ distfiles="https://github.com/mgba-emu/${pkgname}/archive/${version}.tar.gz" checksum="60afef8fb79ba1f7be565b737bae73c6604a790391c737f291482a7422d675ae" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/mlt/template b/srcpkgs/mlt/template index 8933eb4e7bb..5ad199461e6 100644 --- a/srcpkgs/mlt/template +++ b/srcpkgs/mlt/template @@ -11,7 +11,7 @@ hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which" makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk libexif-devel libsamplerate-devel libxml2-devel sox-devel SDL_image-devel fftw-devel frei0r-plugins python3-devel pulseaudio-devel movit-devel - libvidstab-devel libatomic-devel" + libvidstab-devel" depends="mlt-data>=${version}_${revision} ladspa-sdk-example-plugins" short_desc="Multimedia framework, designed for television broadcasting" maintainer="Orphaned " diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 9fb7f60d692..df3e2c559ad 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -9,7 +9,7 @@ hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which makedepends="alsa-lib-devel ffmpeg-devel gtk+-devel jack-devel ladspa-sdk libexif-devel libsamplerate-devel libxml2-devel sox-devel SDL_image-devel fftw-devel frei0r-plugins python3-devel pulseaudio-devel movit-devel - libvidstab-devel libatomic-devel qt5-svg-devel" + libvidstab-devel qt5-svg-devel" depends="mlt7-data>=${version}_${revision} ladspa-sdk-example-plugins" short_desc="Multimedia framework, designed for television broadcasting" maintainer="John " diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index e7735cb57f4..991c06425b4 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -40,10 +40,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="Does not build" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { mv mozc-* mozc diff --git a/srcpkgs/mozjs102/template b/srcpkgs/mozjs102/template index 4bbc084b5a4..2bb2d3e7287 100644 --- a/srcpkgs/mozjs102/template +++ b/srcpkgs/mozjs102/template @@ -25,7 +25,6 @@ checksum=47f8f6243bce8c2ef51adf8c9626bbf643e1c225dcb9ba5653a055ed5e76ca48 LDFLAGS="-Wl,-z,stack-size=1048576" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template index 10d9af44619..8e717515666 100644 --- a/srcpkgs/mozjs78/template +++ b/srcpkgs/mozjs78/template @@ -21,7 +21,6 @@ CXXFLAGS="-Wno-class-memaccess" LDFLAGS="-Wl,-z,stack-size=1048576" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index d4fefbf5e3c..80a5d524d9e 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -43,10 +43,6 @@ changelog="https://github.com/mpv-player/mpv/releases" distfiles="https://github.com/mpv-player/mpv/archive/v${version}.tar.gz" checksum=41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - build_options="alsa caca jack lcms lua openal pulseaudio pipewire sdl2 sndio vapoursynth vdpau vulkan wayland x11" build_options_default="alsa jack lcms lua pulseaudio pipewire vdpau vulkan diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 7c569303c05..193cb06a5fa 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -24,10 +24,6 @@ build_options_default="elogind" export CMAKE_GENERATOR="Unix Makefiles" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { vlicense LICENSE.txt } diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index 176bcf26d8c..2d670e5e284 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -37,7 +37,6 @@ system_accounts="_netdata" conf_files="/etc/${pkgname}/*.conf" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CFLAGS+=" -DLINK_ATOMIC" export LIBS="-latomic" fi diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 20eb0d85fda..06f34d6e9a0 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -62,10 +62,6 @@ make_dirs=" /nix/var/nix/db 0755 root root /nix/store 1775 root nixbld" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { ./bootstrap.sh } diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index aa03b7f48c2..31268b558f8 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -3,10 +3,10 @@ pkgname=nodejs version=18.16.0 revision=2 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 -hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel +hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" -makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel) +makedepends="zlib-devel $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" checkdepends="procps-ng iana-etc" diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index c0ea4d3a94e..8bcb50e307c 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -6,7 +6,7 @@ build_style=cargo configure_args="--features=extra" hostmakedepends="pkg-config python3 libgit2-devel" makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel - libatomic-devel libcurl-devel libzstd-devel liblz4-devel zlib-devel + libcurl-devel libzstd-devel liblz4-devel zlib-devel nghttp2-devel bzip2-devel sqlite-devel" short_desc="Modern shell for the GitHub era" maintainer="Jan Christian Grünhage " diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index 69c635b1ad2..62226978fa3 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -30,10 +30,6 @@ patch_args="-Np1 -d ${build_wrksrc}" # tests hang indenfinitely, even with test data included make_check=no -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - if [ "$CROSS_BUILD" ]; then # Tell opencv where to find python and numpy configure_args+=" -DPYTHON3_INCLUDE_PATH=${XBPS_CROSS_BASE}/${py3_inc} diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template index 2902fc6d4a7..25d74d1138c 100644 --- a/srcpkgs/opendht/template +++ b/srcpkgs/opendht/template @@ -14,10 +14,6 @@ homepage="https://github.com/savoirfairelinux/opendht" distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/v${version}.tar.gz" checksum=5144bc4456d396b527b59065064bbc31fbe0d2af5fd052506219a66895791e64 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - opendht-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision} gnutls-devel nettle-devel" diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 0e9e22e9685..69a9e237869 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -27,10 +27,6 @@ case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DUSE_SIMD=sse2" ;; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { vlicense LICENSE.md LICENSE } diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 291225502c4..77038695442 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -28,7 +28,6 @@ else fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" export LIBS="-latomic" fi diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template index 70a9ec64a4c..3462591ec17 100644 --- a/srcpkgs/openmw/template +++ b/srcpkgs/openmw/template @@ -30,7 +30,6 @@ if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template index 4bfb9a56c07..40596ac750b 100644 --- a/srcpkgs/openttd/template +++ b/srcpkgs/openttd/template @@ -34,10 +34,6 @@ checksum="aafa16d2fb67165134c73a888f79f7a5ed7da17a04cf6e9ecf672c9cb89e7192 e0a218b7dd9438e701503b0f84c25a97c1c11b7c2f025323fb19d6db16ef3759 5a4277a2e62d87f2952ea5020dc20fb2f6ffafdccf9913fbf35ad45ee30ec762" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { bsdtar xf opengfx-${_gfxver}.tar bsdtar xf opensfx-${_sfxver}.tar diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template index 0084a3cb85b..30a61927059 100644 --- a/srcpkgs/openvdb/template +++ b/srcpkgs/openvdb/template @@ -23,7 +23,6 @@ if [ "$XBPS_WORDSIZE" -eq 32 ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index eacba5647d8..a24ce15e597 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -45,7 +45,6 @@ desc_option_ffado="Enable support for FireWire based audio devices" replaces="libpulseaudio-pipewire>=0" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template index bc37ca01e97..32a64971a26 100644 --- a/srcpkgs/plocate/template +++ b/srcpkgs/plocate/template @@ -26,7 +26,6 @@ alternatives=" locate:updatedb.conf.5:/usr/share/man/man5/pupdatedb.conf.5" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LIBS="-latomic" fi diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index f27cb3e5dbe..377183469ae 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -24,7 +24,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CXXFLAGS+=" -latomic " fi diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template index b59ed9cd039..10d3ffa4ba7 100644 --- a/srcpkgs/polybar/template +++ b/srcpkgs/polybar/template @@ -38,7 +38,6 @@ desc_option_mpd="Enable support for MPD" desc_option_network="Enable support for network" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'" fi diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template index 84452b604d5..eb8b48b9ad3 100644 --- a/srcpkgs/primesieve/template +++ b/srcpkgs/primesieve/template @@ -12,10 +12,6 @@ changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/Change distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz" checksum=bab3bc4a1f3247f95b83dfc494ab0ce37a370a7b05379640f58e786d8d5fba61 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { vlicense COPYING } diff --git a/srcpkgs/prometheus-cpp/template b/srcpkgs/prometheus-cpp/template index 3012d53ef47..d0a4f976980 100644 --- a/srcpkgs/prometheus-cpp/template +++ b/srcpkgs/prometheus-cpp/template @@ -8,7 +8,7 @@ _hash_civetweb=fbdee7440be24f904208c15a1fc9e2582b866049 create_wrksrc=yes build_style=cmake hostmakedepends="telegraf protobuf" -makedepends="protobuf-devel libatomic-devel" +makedepends="protobuf-devel" short_desc="Prometheus Client Library in Modern C++" maintainer="Toyam Cox " license="MIT" diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index 828c4b050fd..a0bfce84c0c 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -8,8 +8,7 @@ configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON -Dprotobuf_BUILD_TESTS=OFF" # XXX: Tests require that the abseil-cpp provides absl::scoped_mock_log hostmakedepends="pkg-config" -makedepends="zlib-devel gtest-devel libatomic-devel - abseil-cpp-devel" +makedepends="zlib-devel gtest-devel abseil-cpp-devel" short_desc="Protocol buffers compiler" maintainer="Andrew J. Hesford " license="BSD-3-Clause" diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template index e36b420967f..fba74665b90 100644 --- a/srcpkgs/python3-grpcio-tools/template +++ b/srcpkgs/python3-grpcio-tools/template @@ -16,10 +16,6 @@ checksum=84cc64e5b46bad43d5d7bd2fd772b656eba0366961187a847e908e2cb735db91 export GRPC_PYTHON_BUILD_WITH_CYTHON=1 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_check() { # Subprocesses fail to find the compiled extension when only # PYTHONPATH is set, so copy the extension into to source tree diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index 25ea3fc3462..25662e96363 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -14,10 +14,6 @@ homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" checksum=4c08ee21b3d10315b8dc26f6c13917b20ed574cdbed2d2d80c53d5508fdcc0f2 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" fi diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template index 2cf8da5e62b..881668fd7a1 100644 --- a/srcpkgs/python3-pyqt6/template +++ b/srcpkgs/python3-pyqt6/template @@ -20,10 +20,6 @@ distfiles="$PYPI_SITE/P/PyQt6/PyQt6-$version.tar.gz" checksum=b97cb4be9b2c8997904ea668cf3b0a4ae5822196f7792590d05ecde6216a9fbc lib32disabled=yes -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - # Split like qt6, but keep qt6-core in main pkg python3-pyqt6-core-devel_package() { diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index 5e16b8b5d05..46bddaf8107 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -14,7 +14,6 @@ distfiles="https://github.com/qpdf/qpdf/archive/refs/tags/v${version}.tar.gz" checksum=0e15aaed511928a3d0f5a416e6521640a561a8ce522c574f93ef6472915151f3 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LIBS="-latomic" fi diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template index edeb07f1ab7..679d0fa2ad8 100644 --- a/srcpkgs/qt5-webengine/template +++ b/srcpkgs/qt5-webengine/template @@ -60,24 +60,10 @@ if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then broken="webengine only supports little endian" fi -if [ "$XBPS_NO_ATOMIC8" ]; then - hostmakedepends+=" libatomic-devel" -fi - -# ppc64 still needs libatomic here, as does s390x but we don't have that -case "$XBPS_MACHINE" in - ppc64*) hostmakedepends+=" libatomic-devel" -esac - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi -case "$XBPS_TARGET_MACHINE" in - ppc64*) makedepends+=" libatomic-devel" ;; -esac - case "$XBPS_TARGET_MACHINE" in ppc64*-musl) makedepends+=" libucontext-devel" ;; esac diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index b66658071d4..4ea5f11b1fc 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -41,7 +41,6 @@ esac # some platforms need libatomic if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LIBS+=" -latomic" fi diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index d3821efbe37..86ea3ec2c11 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -49,10 +49,6 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" postgresql-libs-devel" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - _cleanup_wrksrc_leak() { if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then # Replace references to ${wrksrc} in cmake files @@ -1075,9 +1071,6 @@ qt5-devel_package() { qt5-network-${version}_${revision} qt5-xml-${version}_${revision} qt5-host-tools-${version}_${revision}" - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - depends+=" libatomic-devel" - fi short_desc+=" - Development files" # qt5-enginio-devel is gone pkg_install() { diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template index 4b7fbee0562..cce8faba433 100644 --- a/srcpkgs/qt6-3d/template +++ b/srcpkgs/qt6-3d/template @@ -4,8 +4,7 @@ version=6.5.0 revision=1 build_style=cmake hostmakedepends="perl qt6-declarative-host-tools" -makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel - libatomic-devel" +makedepends="qt6-declarative-devel qt6-shadertools-devel libassimp-devel" short_desc="Cross-platform application and UI framework - 3d" maintainer="John " license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0" diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index c2e526cf9c2..891d14580c7 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -23,7 +23,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel xcb-util-renderutil-devel xcb-util-wm-devel MesaLib-devel pcre2-devel icu-devel mtdev-devel harfbuzz-devel libpng-devel tslib-devel libinput-devel gtk+3-devel - libmariadbclient-devel postgresql-libs-devel libatomic-devel + libmariadbclient-devel postgresql-libs-devel unixodbc-devel cups-devel libproxy-devel brotli-devel sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel xcb-util-cursor-devel" diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 2d13e897440..2166d4aa633 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -9,7 +9,7 @@ configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON -DQT_FEATURE_distancefieldgenerator=ON" hostmakedepends="qt6-base perl qt6-plugin-sqlite clang llvm clang-tools-extra qt6-declarative-host-tools" -makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite qt6-declarative-devel +makedepends="qt6-base-devel qt6-plugin-sqlite qt6-declarative-devel gumbo-parser-devel icu-devel llvm clang-tools-extra" short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component" maintainer="John " diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index 71beaceaf3b..8438bb1229d 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -36,7 +36,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CXXFLAGS+=" -latomic " fi diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template index 16019d7eaec..39c643fecdb 100644 --- a/srcpkgs/qtox/template +++ b/srcpkgs/qtox/template @@ -23,7 +23,3 @@ checksum=cd0781241b4ea536da90ce8c72ad9f2aa9bbdf9fbae5d38ee645e30d790fa7f2 build_options="snorenotify" build_options_default="snorenotify" desc_option_snorenotify="Enable support for desktop notifications" - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template index 562ca371bc5..52e343d12ff 100644 --- a/srcpkgs/quickjs/template +++ b/srcpkgs/quickjs/template @@ -19,7 +19,6 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" CFLAGS+=" -DLINK_ATOMIC" export EXTRA_LIBS="-latomic" fi diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template index 6745c96a109..463d9cfb3f1 100644 --- a/srcpkgs/rawtherapee/template +++ b/srcpkgs/rawtherapee/template @@ -5,7 +5,7 @@ revision=2 build_style=cmake configure_args="-DCACHE_NAME_SUFFIX=\"\"" hostmakedepends="pkg-config" -makedepends="fftw-devel gtkmm-devel lensfun-devel libatomic-devel +makedepends="fftw-devel gtkmm-devel lensfun-devel libcanberra-devel libgomp-devel libiptcdata-devel librsvg-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Free RAW converter and digital photo processing software" diff --git a/srcpkgs/receivemidi/template b/srcpkgs/receivemidi/template index 7d83a46b3cb..4f9a0b7566c 100644 --- a/srcpkgs/receivemidi/template +++ b/srcpkgs/receivemidi/template @@ -15,10 +15,6 @@ changelog="https://github.com/gbevin/ReceiveMIDI/releases" distfiles="https://github.com/gbevin/ReceiveMIDI/archive/refs/tags/${version}.tar.gz" checksum=54697ad1a723eea5e3f19ec3bf153795e765b278953dde8be7f350001637bc0a -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_patch() { if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -e 's/-latomic//g' -i Makefile diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 8e8ac83a965..39c45c443d3 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -29,10 +29,6 @@ else make_build_args+=" MALLOC=jemalloc" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_patch() { vsed -i \ -e "s|^# bind 127.0.0.1|bind 127.0.0.1|" \ diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template index 39d51d24167..b663608ce29 100644 --- a/srcpkgs/renderdoc/template +++ b/srcpkgs/renderdoc/template @@ -34,7 +34,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DNEED_LIBATOMIC=ON" fi diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 8a0786c21a0..5fe0e45e4cb 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -20,10 +20,6 @@ checksum=c545b9249ac7dbfef72a2d636bc0f8b729c7ce05f21a54dd9284b2a387592d4a export CXXFLAGS="-std=c++14" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { for l in COPYING LICENSES/*; do vlicense "$l" diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template index 4da7dfcf067..eea463a6d1a 100644 --- a/srcpkgs/rocksdb/template +++ b/srcpkgs/rocksdb/template @@ -13,10 +13,6 @@ homepage="https://github.com/facebook/rocksdb" distfiles="https://github.com/facebook/rocksdb/archive/v${version}.tar.gz" checksum=886378093098a1b2521b824782db7f7dd86224c232cf9652fcaf88222420b292 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="assembler errors" fi diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template index 04e4d91c0f1..32f1f9f1607 100644 --- a/srcpkgs/rubberband/template +++ b/srcpkgs/rubberband/template @@ -17,7 +17,6 @@ distfiles="https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz checksum=82edacd0c50bfe56a6a85db1fcd4ca3346940ffe02843fc50f8b92f99a97d172 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 3331675ac25..0d955b4a8d1 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -41,11 +41,6 @@ else hostmakedepends+=" rust-bootstrap" fi -# see https://github.com/rust-lang/rust/commit/1db81713f6475bebd0ae689ac7139c53d2843c48 -case "$XBPS_TARGET_MACHINE" in - armv*) makedepends+=" libatomic-devel" ;; -esac - # we need this because cargo verifies checksums of all files in vendor # crates when it builds and gives us no way to override or update the # file sanely... so just clear out the file list diff --git a/srcpkgs/sendmidi/template b/srcpkgs/sendmidi/template index 95b1862e1a6..2b44c25e724 100644 --- a/srcpkgs/sendmidi/template +++ b/srcpkgs/sendmidi/template @@ -15,10 +15,6 @@ changelog="https://github.com/gbevin/SendMIDI/releases" distfiles="https://github.com/gbevin/SendMIDI/archive/refs/tags/${version}.tar.gz" checksum=3fb3d16ee14784e057e633b6e57fede33ac291d9af85942106fde8b431e15740 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_patch() { if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -e 's/-latomic//g' -i Makefile diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template index 2440d44d8f5..399882ada20 100644 --- a/srcpkgs/snapcast/template +++ b/srcpkgs/snapcast/template @@ -21,10 +21,6 @@ checksum=c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba build_options="avahi pulseaudio" build_options_default="avahi pulseaudio" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_install() { vdoc README.md vdoc doc/player_setup.md diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template index c406f9c72c1..3a7a68fc13b 100644 --- a/srcpkgs/solvespace/template +++ b/srcpkgs/solvespace/template @@ -22,7 +22,6 @@ checksum="ab4b3a5fecb1800f8eab82a92138a70227e869d2066ee881441b1e13035786dc nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'" fi diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index 0f70214f857..f563ad3d40a 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -16,10 +16,6 @@ changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/d distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz" checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then vsed -i "s/^general_link_args = \[\]/general_link_args = \['-latomic'\]/" meson.build diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template index 49b9eb9d7b9..ca758380e90 100644 --- a/srcpkgs/squid/template +++ b/srcpkgs/squid/template @@ -60,7 +60,6 @@ system_accounts="squid" make_check=no if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/srt/template b/srcpkgs/srt/template index 76a4d1055c7..3fa0bbcbddb 100644 --- a/srcpkgs/srt/template +++ b/srcpkgs/srt/template @@ -16,10 +16,6 @@ changelog="https://github.com/Haivision/srt/releases" distfiles="https://github.com/Haivision/srt/archive/refs/tags/v${version}.tar.gz" checksum=463970a3f575446b3f55abb6f323d5476c963c77b3c975cd902e9c87cdd9a92c -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - libsrt_package() { depends="libsrt>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template index 363603f83d5..5203abfa667 100644 --- a/srcpkgs/stockfish/template +++ b/srcpkgs/stockfish/template @@ -35,7 +35,6 @@ case $XBPS_TARGET_MACHINE in esac if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 42b58d5b6e3..7c147c4a59e 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -6,7 +6,7 @@ build_style=cmake make_cmd=make configure_args="-DENABLE_TESTSUITE=OFF -DSYSTEM_BOOST=ON -DSYSTEM_YAMLCPP=ON" hostmakedepends="emacs pkg-config qt5-host-tools qt5-qmake" -makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libatomic-devel +makedepends="avahi-libs-devel boost-devel fftw-devel jack-devel libsndfile-devel libXt-devel qt5-declarative-devel qt5-location-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-sensors-devel qt5-tools-devel qt5-svg-devel diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template index 47a962d2482..85b54d559a3 100644 --- a/srcpkgs/supertuxkart/template +++ b/srcpkgs/supertuxkart/template @@ -19,10 +19,6 @@ changelog="https://raw.githubusercontent.com/supertuxkart/stk-code/master/CHANGE distfiles="https://github.com/supertuxkart/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz" checksum=9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - supertuxkart-data_package() { short_desc+=" - data files" pkg_install() { diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index 674f1505bf0..cf4715b1b54 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -18,6 +18,5 @@ distfiles="http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz checksum=feb2815a51d34fa81cb34e8149830405935a7e1d1c1950461239750baa8b49f0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/syntax-highlighting/template b/srcpkgs/syntax-highlighting/template index 70375ffe0b8..a954c8c38dd 100644 --- a/srcpkgs/syntax-highlighting/template +++ b/srcpkgs/syntax-highlighting/template @@ -6,8 +6,7 @@ build_style=cmake configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer" hostmakedepends="kcoreaddons extra-cmake-modules perl qt5-host-tools qt5-qmake qt5-tools qt5-devel qt5-tools-devel" -makedepends="qt5-devel qt5-tools-devel qt5-xmlpatterns-devel - libatomic-devel" +makedepends="qt5-devel qt5-tools-devel qt5-xmlpatterns-devel" short_desc="Syntax highlighting engine for structured text and code" maintainer="John " license="LGPL-2.1-or-later" diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template index e2fe7be0cc8..45e6ab6adb0 100644 --- a/srcpkgs/sysbench/template +++ b/srcpkgs/sysbench/template @@ -18,10 +18,6 @@ homepage="https://github.com/akopytov/sysbench" distfiles="https://github.com/akopytov/sysbench/archive/${version}.tar.gz" checksum=e8ee79b1f399b2d167e6a90de52ccc90e52408f7ade1b9b7135727efe181347f -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { autoreconf -fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 22e46e4e95e..19a6722f469 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -15,7 +15,7 @@ hostmakedepends="pkg-config qt6-base python3 clang extra-cmake-modules makedepends="alsa-lib-devel boost-devel fmt-devel ffmpeg-devel gobject-introspection libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3 qt6-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel - MesaLib-devel qt6-wayland-devel qt6-qt5compat-devel libatomic-devel + MesaLib-devel qt6-wayland-devel qt6-qt5compat-devel xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel) protobuf-devel glibmm2.68-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel qt6-declarative-devel" depends="qt6-imageformats ttf-opensans" diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template index 1912cfb7ed3..4e0fbc519e6 100644 --- a/srcpkgs/thrift/template +++ b/srcpkgs/thrift/template @@ -19,10 +19,6 @@ homepage="https://thrift.apache.org/" distfiles="https://github.com/apache/thrift/archive/v${version}.tar.gz" checksum=9cea30b9700153329ae1926cc05a20bbe3e8451ae270b0c8c5c5fe9929924cb3 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - if [ "$CROSS_BUILD" ]; then configure_args+=" -DBUILD_TESTING=OFF -DBUILD_TUTORIALS=OFF" fi diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 551e968ce98..d26f88c3d7e 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -35,10 +35,6 @@ case $XBPS_TARGET_MACHINE in ppc*) broken="xptcall bitrot" ;; esac -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - # try to minimize memory usage via debug symbols # 'LLVM ERROR: out of memory' while compiling gtkrust if [ "$XBPS_WORDSIZE" = "32" ]; then diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index 341645af8e4..cb6b40de7e9 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -39,10 +39,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - CXXFLAGS="-Wno-deprecated-declarations" tomahawk-devel_package() { diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template index 46731dcdaf0..8645921e88d 100644 --- a/srcpkgs/uhd/template +++ b/srcpkgs/uhd/template @@ -32,7 +32,6 @@ else fi if [ "$_use_libatomic" = "yes" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template index f9d3905ace6..4ceda6e7724 100644 --- a/srcpkgs/vapoursynth/template +++ b/srcpkgs/vapoursynth/template @@ -14,7 +14,6 @@ distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz" checksum=9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS="-latomic" fi diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template index 28c2a8d66e3..876281c0790 100644 --- a/srcpkgs/vkQuake/template +++ b/srcpkgs/vkQuake/template @@ -14,7 +14,6 @@ distfiles="${homepage}/archive/${version}.tar.gz" checksum=b88d3dfc869d89820766e2dd18bdadb9681adfc4c9d05e09cbbebcc17ef1d150 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" LDFLAGS+=" -latomic" fi diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template index a1d61de2d14..867554b13ac 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -33,10 +33,6 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then LDFLAGS="-lexecinfo" fi -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { [ "$XBPS_TARGET_NO_ATOMIC8" ] || return 0 diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index baf48548dd4..f8f23952f3f 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -17,10 +17,6 @@ distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version checksum=01d608f6f9638e14d7c857df40ad339c1bfc207a05daafe7157ad8652a3405c3 nocross="fails to detect SDL2 when cross-compiling" -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - post_extract() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then echo "target_link_libraries(warzone2100 atomic)" >> CMakeLists.txt diff --git a/srcpkgs/watchexec/template b/srcpkgs/watchexec/template index a2fdc6e7e04..4b8cf746d80 100644 --- a/srcpkgs/watchexec/template +++ b/srcpkgs/watchexec/template @@ -12,7 +12,6 @@ distfiles="https://github.com/watchexec/watchexec/archive/refs/tags/v${version}. checksum=698ed1dc178279594542f325b23f321c888c9c12c1960fe11c0ca48ba6edad76 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" XBPS_CROSS_RUSTFLAGS+=" -latomic" fi diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 15e98aaca3b..421fa8b2d0c 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -26,7 +26,7 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel libsoup-devel libsoup3-devel libxslt-devel gnutls-devel icu-devel enchant2-devel dbus-glib-devel libwebp-devel gtk+3-devel gtk4-devel libgudev-devel libsecret-devel ruby-devel geoclue2-devel libnotify-devel hyphen-devel - woff2-devel freetype-devel libopenjpeg2-devel libatomic-devel libavif-devel + woff2-devel freetype-devel libopenjpeg2-devel libavif-devel qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel) $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')" diff --git a/srcpkgs/wt/template b/srcpkgs/wt/template index de480ebb7dc..33a48ed75ff 100644 --- a/srcpkgs/wt/template +++ b/srcpkgs/wt/template @@ -13,7 +13,6 @@ distfiles="https://github.com/emweb/wt/archive/refs/tags/${version}.tar.gz" checksum=7090023d4fc4b6594bf4cb11072d9d3d775269327aece9a8993c7bbe46decb9d if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" configure_args+=" -DCMAKE_CXX_FLAGS=-latomic" fi diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template index 10ed861b139..8e9851575bc 100644 --- a/srcpkgs/xrootd/template +++ b/srcpkgs/xrootd/template @@ -21,5 +21,4 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic" - makedepends+=" libatomic-devel" fi diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index e53f25d2708..a1a9ea8d16c 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -23,10 +23,6 @@ dkms_modules="zfs ${version}" replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0 -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" -fi - pre_configure() { export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/tirpc/" autoreconf -fi