diff options
39 files changed, 87 insertions, 360 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 0958972a238..c9d48c1997d 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.137 2020/11/13 16:09:47 nia Exp $ +# $NetBSD: Makefile,v 1.138 2020/12/31 20:04:11 nia Exp $ DISTNAME= audacity-2.4.1 PKGREVISION= 2 @@ -53,16 +53,6 @@ CONFIGURE_ARGS+= --with-soundtouch="system" .include "../../mk/bsd.prefs.mk" -# 64 bit atomic ops are required - -.if ${MACHINE_ARCH} == "i386" -CXXFLAGS+= -march=i586 -.endif - -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" CONFIGURE_ARGS+= --disable-sse .endif @@ -117,4 +107,5 @@ BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0 .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 16ec3c78226..3e88ff48fa8 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2020/11/13 16:10:43 nia Exp $ +# $NetBSD: Makefile,v 1.91 2020/12/31 20:04:11 nia Exp $ DISTNAME= cmus-2.8.0 PKGREVISION= 7 @@ -47,17 +47,8 @@ CONFIGURE_ARGS+= CONFIG_SUN=n PLIST.coreaudio= yes .endif -# 64 bit atomic ops are required - -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -march=i586 -.endif - -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - .include "options.mk" +.include "../../mk/atomic64.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncursesw/buildlink3.mk" diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile index 2fea679f4b9..6aaf4af75ae 100644 --- a/databases/kyotocabinet/Makefile +++ b/databases/kyotocabinet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/11/23 14:00:39 nia Exp $ +# $NetBSD: Makefile,v 1.9 2020/12/31 20:04:11 nia Exp $ # DISTNAME= kyotocabinet-1.2.78 @@ -23,17 +23,5 @@ TEST_TARGET= check PTHREAD_AUTO_VARS= yes .include "../../mk/pthread.buildlink3.mk" - -.include "../../mk/bsd.prefs.mk" -.include "../../mk/compiler.mk" -# using GCC atomic functions only available with i586 in kcthread.cc -.if !empty(CC_VERSION:Mgcc-*) && !empty(MACHINE_ARCH:Mi[34]86) -GNU_ARCH.i386= i586 -CFLAGS+= -march=i586 -.endif - -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common index 76108295fa8..02d3b352ce6 100644 --- a/databases/mysql57-client/Makefile.common +++ b/databases/mysql57-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2020/10/21 13:34:50 adam Exp $ +# $NetBSD: Makefile.common,v 1.30 2020/12/31 20:04:11 nia Exp $ # # used by databases/mysql57-client/Makefile # used by databases/mysql57-server/Makefile @@ -75,12 +75,6 @@ CMAKE_ARGS+= -DDEFAULT_CHARSET=${MYSQL_CHARSET} CMAKE_ARGS+= -DDEFAULT_COLLATION=${MYSQL_COLLATION} CMAKE_ARGS+= -DWITH_EXTRA_CHARSETS=${MYSQL_EXTRA_CHARSET} -# we need atomic builtins -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" -GNU_ARCH.i386= i586 -CFLAGS+= -march=i586 -.endif - CPPFLAGS+= -Dunix CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat #CFLAGS+= -D__STDC_FORMAT_MACROS=1 # always defined too late @@ -132,3 +126,4 @@ CHECK_PORTABILITY_SKIP+= packaging/deb-in/mysql-packagesource-server.config.in .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" +.include "../../mk/atomic64.mk" diff --git a/databases/mysql57-client/hacks.mk b/databases/mysql57-client/hacks.mk deleted file mode 100644 index 17c4399e28e..00000000000 --- a/databases/mysql57-client/hacks.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2020/09/22 19:39:26 he Exp $ - -.if !defined(MYSQL_HACKS_MK) -MYSQL_HACKS_MK= defined - -# [Tue Sep 22 21:38:02 CEST 2020 : he] -# On NetBSD/powerpc, use devel/libatomic to get 8-byte atomics. -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.endif # MYSQL_HACKS_MK diff --git a/databases/mysql57-server/hacks.mk b/databases/mysql57-server/hacks.mk deleted file mode 100644 index 13c21dce4ad..00000000000 --- a/databases/mysql57-server/hacks.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2020/09/22 22:18:55 he Exp $ - -.if !defined(MYSQL_HACKS_MK) -MYSQL_HACKS_MK= defined - -# [Tue Sep 22 21:38:02 CEST 2020 : he] -# On NetBSD/powerpc, use devel/libatomic to get 8-byte atomics. -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.endif # MYSQL_HACKS_MK diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 3b778d9f001..22708b0f385 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2020/10/27 10:22:34 adam Exp $ +# $NetBSD: Makefile,v 1.63 2020/12/31 20:04:11 nia Exp $ DISTNAME= redis-6.0.9 CATEGORIES= databases @@ -60,11 +60,6 @@ CHECK_PORTABILITY_SKIP+= deps/jemalloc/configure post-extract: ${CHMOD} -R g-w ${WRKSRC} -.if ${MACHINE_ARCH} == "i386" -# Need 8 byte atomics. -CFLAGS+= -march=i586 -.endif - post-install: ${INSTALL_DATA} ${WRKSRC}/redis.conf ${DESTDIR}${EGDIR}/redis.conf.example .for file in ${DOCFILES} @@ -75,4 +70,5 @@ do-test: cd ${WRKSRC} && ${SH} runtest .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile index 796ebfbb22c..38d48541d88 100644 --- a/devel/protobuf/Makefile +++ b/devel/protobuf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2020/11/14 14:07:40 adam Exp $ +# $NetBSD: Makefile,v 1.36 2020/12/31 20:04:11 nia Exp $ DISTNAME= protobuf-cpp-3.14.0 PKGNAME= ${DISTNAME:S/-cpp//} @@ -29,11 +29,6 @@ CHECK_PORTABILITY_SKIP+= src/google/protobuf/compiler/zip_output_unittest.sh SET_LIBDIR= yes -.if ${MACHINE_ARCH} == "i386" -# 64 bit atomic ops are required -CXXFLAGS+= -march=i586 -.endif - # configure: error: *** A compiler with support for C++11 language features is required. GCC_REQD+= 4.8 @@ -42,4 +37,5 @@ GCC_REQD+= 4.8 BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.0.4 .include "../../devel/zlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/protobuf/hacks.mk b/devel/protobuf/hacks.mk deleted file mode 100644 index 39ce3e79663..00000000000 --- a/devel/protobuf/hacks.mk +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2020/09/08 08:35:23 he Exp $ - -.if !defined(PROTOBUF_HACKS_MK) -PROTOBUF_HACKS_MK= defined - -# [ Tue Sep 8 08:38:08 CEST 2020 : he ] -# Bring -latomic into scope; build insists on it being available -# on this platform (probably due to no native 8-byte atomics). -.if !empty(MACHINE_ARCH:Mpowerpc*) -.include "../../devel/libatomic/buildlink3.mk" -PKG_HACKS+= powerpc-libatomic -.endif - -.endif # PROTOBUF_HACKS_MK diff --git a/emulators/libretro-parallel-n64/Makefile b/emulators/libretro-parallel-n64/Makefile index 58b807808bf..f6ec9172fa3 100644 --- a/emulators/libretro-parallel-n64/Makefile +++ b/emulators/libretro-parallel-n64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2020/11/13 16:15:54 nia Exp $ +# $NetBSD: Makefile,v 1.3 2020/12/31 20:04:11 nia Exp $ DISTNAME= libretro-parallel-n64-20200528 CATEGORIES= emulators @@ -36,12 +36,9 @@ MAKE_FLAGS+= WITH_DYNAREC= CFLAGS+= -DNO_ASM .endif -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./libretro/link.T .include "options.mk" .include "../../emulators/retroarch/core.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lgogdownloader/Makefile b/games/lgogdownloader/Makefile index 1a087825115..ce99e5121bd 100644 --- a/games/lgogdownloader/Makefile +++ b/games/lgogdownloader/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2020/05/22 10:56:08 adam Exp $ +# $NetBSD: Makefile,v 1.51 2020/12/31 20:04:11 nia Exp $ DISTNAME= lgogdownloader-3.7 PKGREVISION= 1 @@ -17,13 +17,6 @@ USE_LANGUAGES= c c++ USE_CMAKE= yes USE_TOOLS+= pkg-config -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" -# 64 bit atomic ops are required -CXXFLAGS+= -march=i586 -.endif - CMAKE_ARGS+= -DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json .include "../../devel/boost-libs/buildlink3.mk" @@ -32,4 +25,5 @@ CMAKE_ARGS+= -DJSONCPP_INCLUDE_DIR=${BUILDLINK_DIR}/include/json .include "../../www/curl/buildlink3.mk" .include "../../misc/rhash/buildlink3.mk" .include "../../textproc/jsoncpp/buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile index b69296d403d..0ad2f3191e9 100644 --- a/games/supertuxkart/Makefile +++ b/games/supertuxkart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2020/05/22 10:56:10 adam Exp $ +# $NetBSD: Makefile,v 1.38 2020/12/31 20:04:12 nia Exp $ DISTNAME= supertuxkart-1.1-src PKGNAME= ${DISTNAME:S/-src//} @@ -22,20 +22,6 @@ CMAKE_ARGS+= -DBUILD_RECORDER=OFF # Needs linux joystick support. CMAKE_ARGS+= -DENABLE_WAYLAND_DEVICE=OFF -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" -# 64 bit atomic ops are required -CXXFLAGS+= -march=i586 -.endif - -# lib/mcpp/eval.c: In function 'eval_if': -# lib/mcpp/eval.c:361:44: error: array subscript has type 'char' [-Werror=char-subscripts] -# , opname[ op], prec, opname[ opp->op], opp->prec, opp->skip); -# ^ -# Maybe fix this later. -BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts - .include "../../archivers/bzip2/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/openal-soft/buildlink3.mk" @@ -56,4 +42,5 @@ BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts .endif .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 1b48b26994d..9aff5b6e732 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.222 2020/12/26 17:02:37 nia Exp $ +# $NetBSD: Makefile,v 1.223 2020/12/31 20:04:12 nia Exp $ DISTNAME= inkscape-1.0.1 PKGREVISION= 3 @@ -75,15 +75,6 @@ MANCOMPRESSED= yes CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include .endif -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -march=i586 -CXXFLAGS+= -march=i586 -.endif - -.if ${MACHINE_ARCH} == "powerpc" -. include "../../devel/libatomic/buildlink3.mk" -.endif - # There exists some race condition in create_default_templates.py that # makes default.es_MX.svg sometimes not get installed. # (gettext translation file dependency not correctly expressed in cmake?) @@ -121,4 +112,5 @@ BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4 .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../lang/python/application.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mozjs78/Makefile b/lang/mozjs78/Makefile index 631c7a23ccb..cdc88c7ed9f 100644 --- a/lang/mozjs78/Makefile +++ b/lang/mozjs78/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2020/12/30 06:10:37 gutteridge Exp $ +# $NetBSD: Makefile,v 1.16 2020/12/31 20:04:12 nia Exp $ DISTNAME= mozjs78_78.4.0.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} @@ -39,20 +39,6 @@ CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} BUILDLINK_TRANSFORM.SunOS+= rm:-pie -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" -# 64 bit atomics -CXXFLAGS+= -march=i586 -.endif - -# XXX This does not work entirely correctly at present. There are -# 26 atomic type test failures on powerpc, where these pass on i386. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) -# 64 bit atomics -.include "../../devel/libatomic/buildlink3.mk" -.endif - SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_MESSAGE.conf= Set variables in configuration file. @@ -93,4 +79,7 @@ RUST_REQ= 1.41.0 .include "../../lang/python/tool.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../mk/readline.buildlink3.mk" +# XXX This does not work entirely correctly at present. There are +# 26 atomic type test failures on powerpc, where these pass on i386. +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile index 4b93b7f91bf..8b7bdf22baa 100644 --- a/lang/nodejs/Makefile +++ b/lang/nodejs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.204 2020/12/21 09:41:32 adam Exp $ +# $NetBSD: Makefile,v 1.205 2020/12/31 20:04:12 nia Exp $ DISTNAME= node-v14.15.3 EXTRACT_SUFX= .tar.xz @@ -18,8 +18,6 @@ PYTHON_VERSIONS_ACCEPTED= 27 CHECK_PORTABILITY_SKIP+= tools/macos-installer/pkgbuild/npm/scripts/preinstall .if ${MACHINE_ARCH} == "i386" -# 64 bit atomic ops are required -CXXFLAGS+= -march=i586 # required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -38,4 +36,5 @@ CXXFLAGS+= -mstackrealign # Requires nghttp2_option_set_max_settings BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0 .include "../../www/nghttp2/buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nodejs12/Makefile b/lang/nodejs12/Makefile index 82fa1cc7387..d25b3a9eee6 100644 --- a/lang/nodejs12/Makefile +++ b/lang/nodejs12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2020/12/16 07:42:39 adam Exp $ +# $NetBSD: Makefile,v 1.27 2020/12/31 20:04:12 nia Exp $ DISTNAME= node-v12.20.0 @@ -18,8 +18,6 @@ CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh CHECK_PORTABILITY_SKIP+= tools/macos-installer/* .if ${MACHINE_ARCH} == "i386" -# 64 bit atomic ops are required -CXXFLAGS+= -march=i586 # required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -31,4 +29,5 @@ CXXFLAGS+= -mstackrealign # Requires nghttp2_option_set_max_settings BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0 .include "../../www/nghttp2/buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 6b0edfae7be..a2aa31ed3c1 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.247 2020/12/04 20:45:30 nia Exp $ +# $NetBSD: Makefile,v 1.248 2020/12/31 20:04:12 nia Exp $ VERREL= 7.0.3 VERRC= 1 @@ -262,11 +262,6 @@ BUILD_MAKE_FLAGS+= VERBOSE=true BUILDLINK_TRANSFORM+= rm:-ldl .endif -.if ${MACHINE_ARCH} == "i386" -# For 64 bit atomic ops (PR/54826) -CXXFLAGS+= -march=i586 -.endif - INSTALLATION_DIRS= bin share/applications .PHONY: debugrun @@ -419,5 +414,5 @@ BUILDLINK_API_DEPENDS.libodfgen+= libodfgen>=0.1.4 .include "../../mk/pthread.buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" - +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mk/atomic64.mk b/mk/atomic64.mk new file mode 100644 index 00000000000..b9c4b333947 --- /dev/null +++ b/mk/atomic64.mk @@ -0,0 +1,24 @@ +# $NetBSD: atomic64.mk,v 1.1 2020/12/31 20:04:12 nia Exp $ +# +# This Makefile fragment is included by packages that require 64-bit atomic +# operations, and will attempt to set the appropriate architecture-specific +# compiler flags. + +.if !defined(ATOMIC64_MK) + +ATOMIC64_MK:= + +.include "../../bsd.fast.prefs.mk" + +.if ${MACHINE_ARCH} == "i386" +. if empty(CFLAGS:M*march=*) +CFLAGS+= -march=i586 +CXXFLAGS+= -march=i586 +. endif +.endif + +.if ${MACHINE_ARCH} == "powerpc" +. include "../../devel/libatomic/buildlink3.mk" +.endif + +.endif diff --git a/multimedia/lightspark/Makefile b/multimedia/lightspark/Makefile index 941917aacb1..a716f313ad0 100644 --- a/multimedia/lightspark/Makefile +++ b/multimedia/lightspark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2020/12/03 22:23:33 nia Exp $ +# $NetBSD: Makefile,v 1.15 2020/12/31 20:04:12 nia Exp $ DISTNAME= lightspark-0.8.3 CATEGORIES= multimedia @@ -24,12 +24,6 @@ GCC_REQD+= 4.6 CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \ ${PKG_SYSCONFDIR}/xdg/lightspark.conf -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - .include "../../archivers/xz/buildlink3.mk" .include "../../audio/SDL2_mixer/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -48,4 +42,5 @@ CONF_FILES+= ${PREFIX}/share/examples/lightspark/xdg/lightspark.conf \ .include "../../x11/libXext/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 891bc2b6384..04c86521e37 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.119 2020/12/24 09:28:14 nia Exp $ +# $NetBSD: Makefile,v 1.120 2020/12/31 20:04:12 nia Exp $ DISTNAME= mpv-0.33.0 CATEGORIES= multimedia @@ -59,22 +59,10 @@ BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/l . endif .endif -# 64-bit atomic operations -# https://mail-index.netbsd.org/pkgsrc-users/2020/12/23/msg032927.html -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -march=i586 -CXXFLAGS+= -march=i586 -.endif - -.if ${MACHINE_ARCH} == "powerpc" -.include "../../devel/libatomic/buildlink3.mk" -.endif - post-install: cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv .include "options.mk" - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/waf/waf.mk" .include "../../devel/zlib/buildlink3.mk" @@ -86,4 +74,5 @@ post-install: .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index a26a0189297..4ad33a24453 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.132 2020/11/05 09:08:51 ryoon Exp $ +# $NetBSD: Makefile,v 1.133 2020/12/31 20:04:13 nia Exp $ VERSION= 3.50.0 DISTNAME= FileZilla_${VERSION}_src @@ -28,12 +28,6 @@ GNU_CONFIGURE_WX_VERSION= no GCC_REQD+= 7 .include "options.mk" - -# As of 3.41, 64-bit atomic ops are required -.if ${MACHINE_ARCH} == "i386" -CXXFLAGS+= -march=i586 -.endif - .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" @@ -46,4 +40,5 @@ BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2nb1 .include "../../textproc/pugixml/buildlink3.mk" BUILDLINK_API_DEPENDS.wxGTK30+= wxGTK30>=3.0.4 .include "../../x11/wxGTK30/buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index d6a5e784ff9..f171bb3f3cd 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.108 2020/08/31 18:10:33 wiz Exp $ +# $NetBSD: Makefile,v 1.109 2020/12/31 20:04:13 nia Exp $ .include "Makefile.common" @@ -221,4 +221,5 @@ post-install: ${RM} -f ${DESTDIR}${PREFIX}/lib/*.a ${DESTDIR}${PREFIX}/lib/*.la .include "../../mk/pam.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/freeradius/hacks.mk b/net/freeradius/hacks.mk deleted file mode 100644 index bc55f6d0e54..00000000000 --- a/net/freeradius/hacks.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2020/11/16 11:57:19 nia Exp $ - -.if !defined(FREERADIUS_HACKS_MK) -FREERADIUS_HACKS_MK= defined - -# [Mon Sep 7 20:40:36 CEST 2020 : he] -# On NetBSD/powerpc, we don't have native 8-byte atomics, -# but this package insists on using them, so here we need libatomic. -.if ${MACHINE_ARCH} == "powerpc" -PKG_HACKS+= powerpc-libatomic -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.if ${MACHINE_ARCH} == "i386" -PKG_HACKS+= i386-atomics -CFLAGS+= -march=i586 -.endif - -.endif # FREERADIUS_HACKS_MK diff --git a/net/frr/Makefile b/net/frr/Makefile index 48865735559..2cde931a2ab 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/12/10 16:43:24 kardel Exp $ +# $NetBSD: Makefile,v 1.2 2020/12/31 20:04:13 nia Exp $ GITHUB_PROJECT= frr VERSION= 7.5 @@ -24,11 +24,6 @@ BUILD_DEFS= VARBASE .include "../../mk/bsd.prefs.mk" .include "options.mk" -# to pick up the atomic implementation on i386 -.if ${MACHINE_ARCH} == "i386" -CPPFLAGS+= -march=i586 -.endif - FRR_GROUP?= _frr FRR_VTY_GROUP?= frrvty @@ -98,7 +93,7 @@ pre-configure: .include "../../textproc/json-c/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../devel/readline/buildlink3.mk" - +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" # needs to be here to have ${EGREP} defined diff --git a/net/grpc/Makefile b/net/grpc/Makefile index 91b7d5dc528..695d77ec783 100644 --- a/net/grpc/Makefile +++ b/net/grpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2020/12/06 10:50:11 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2020/12/31 20:04:13 nia Exp $ DISTNAME= grpc-1.34.0 CATEGORIES= net @@ -25,14 +25,7 @@ CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package CMAKE_ARGS+= -DgRPC_SSL_PROVIDER=package CMAKE_ARGS+= -DgRPC_ZLIB_PROVIDER=package -.include "../../mk/bsd.prefs.mk" - -# 64 bit atomic ops are required -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -march=i586 -CXXFLAGS+= -march=i586 -.endif - +.include "../../mk/atomic64.mk" .include "../../benchmarks/google-benchmark/buildlink3.mk" .include "../../devel/abseil/buildlink3.mk" .include "../../devel/gflags/buildlink3.mk" diff --git a/print/qpdf/Makefile b/print/qpdf/Makefile index 525b53e657f..fb77b156792 100644 --- a/print/qpdf/Makefile +++ b/print/qpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2020/10/30 15:13:31 ryoon Exp $ +# $NetBSD: Makefile,v 1.41 2020/12/31 20:04:13 nia Exp $ DISTNAME= qpdf-10.0.2 CATEGORIES= print @@ -18,4 +18,5 @@ PKGCONFIG_OVERRIDE+= libqpdf.pc.in .include "../../mk/jpeg.buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/qpdf/hacks.mk b/print/qpdf/hacks.mk deleted file mode 100644 index 25e60b19e58..00000000000 --- a/print/qpdf/hacks.mk +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2020/12/24 20:29:14 yhardy Exp $ - -.if !defined(QPDF_HACKS_MK) -QPDF_HACKS_MK= defined - -# [Tue Dec 15 15:49:14 SAST 2020 : yhardy] -# On i386 archs libqpdf/QPDF.cc fails to compile because 64-bit atomic -# operations are needed. Forcing -march=i586 (or better) avoids that -# (i[56]86 provide required). -.if ${MACHINE_ARCH} == "i386" -PKG_HACKS+= i386-atomicops -CXXFLAGS+= -march=i586 -.endif - -# [Tue Dec 15 15:49:14 SAST 2020 : yhardy] -# On NetBSD/powerpc, we don't have native 8-byte atomics, but qpdf -# needs it for a global long long counter, so here we need libatomic. -.if ${MACHINE_ARCH} == "powerpc" -PKG_HACKS+= powerpc-libatomic -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.endif # QPDF_HACKS_MK diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile index b7f701e4782..d9fa8af121f 100644 --- a/sysutils/rsyslog/Makefile +++ b/sysutils/rsyslog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2020/05/22 10:56:40 adam Exp $ +# $NetBSD: Makefile,v 1.27 2020/12/31 20:04:13 nia Exp $ # BUILDLINK_DEPMETHOD.libestr= full @@ -32,11 +32,6 @@ PLIST.klog= yes RSYSLOG_SYSMOD= imklog .endif -# needs to be able to do compare-and-swap on time_t (cmpxchg8b) -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -march=i586 -.endif - BUILDLINK_TRANSFORM.Darwin+= rm:-luuid BUILD_DEFS+= VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR @@ -70,4 +65,5 @@ post-install: BUILDLINK_API_DEPENDS.liblognorm+= liblognorm>=2.0.3 .include "../../sysutils/liblognorm/buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index b7868f26b68..6131007c280 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.191 2020/12/17 09:53:15 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.192 2020/12/31 20:04:13 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -48,9 +48,8 @@ test: TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} USE_TOOLS+= bsdtar .endif + .if ${MACHINE_ARCH} == "i386" -# Fix for PR pkg/48152. -CXXFLAGS+= -march=i586 # This is required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -155,11 +154,7 @@ CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= -# PR pkg/55456 -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" -.include "../../devel/libatomic/buildlink3.mk" -CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes -.endif +.include "../../mk/atomic64.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" diff --git a/www/firefox52/mozilla-common.mk b/www/firefox52/mozilla-common.mk index b8db90321e4..e4e25c1ebdd 100644 --- a/www/firefox52/mozilla-common.mk +++ b/www/firefox52/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.12 2020/12/23 08:20:04 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.13 2020/12/31 20:04:13 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -33,8 +33,6 @@ TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} USE_TOOLS+= bsdtar .endif .if ${MACHINE_ARCH} == "i386" -# Fix for PR pkg/48152. -CXXFLAGS+= -march=i586 # This is required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -140,6 +138,7 @@ PYTHON_VERSIONS_ACCEPTED= 27 PYTHON_FOR_BUILD_ONLY= tool TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat +.include "../../mk/atomic64.mk" .include "../../archivers/bzip2/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/libevent/buildlink3.mk" diff --git a/www/firefox68/mozilla-common.mk b/www/firefox68/mozilla-common.mk index ee01490e6c2..8b88e57bdf9 100644 --- a/www/firefox68/mozilla-common.mk +++ b/www/firefox68/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.16 2020/11/12 10:03:24 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.17 2020/12/31 20:04:14 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -58,8 +58,6 @@ USE_TOOLS+= bsdtar USE_PKGSRC_GCC_RUNTIME= yes .endif .if ${MACHINE_ARCH} == "i386" -# Fix for PR pkg/48152. -CXXFLAGS+= -march=i586 # This is required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -167,6 +165,7 @@ CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= PREFER.bzip2?= pkgsrc .endif +.include "../../mk/atomic64.mk" .include "../../archivers/bzip2/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/libevent/buildlink3.mk" diff --git a/www/firefox78/mozilla-common.mk b/www/firefox78/mozilla-common.mk index 58e4fb90cf5..4c9012e0d22 100644 --- a/www/firefox78/mozilla-common.mk +++ b/www/firefox78/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.6 2020/11/16 20:21:29 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.7 2020/12/31 20:04:14 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -49,8 +49,6 @@ TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} USE_TOOLS+= bsdtar .endif .if ${MACHINE_ARCH} == "i386" -# Fix for PR pkg/48152. -CXXFLAGS+= -march=i586 # This is required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -163,11 +161,7 @@ CONFIGURE_ENV.NetBSD+= ac_cv_thread_keyword=no # In unspecified case, clock_gettime(CLOCK_MONOTONIC, ...) fails. CONFIGURE_ENV.NetBSD+= ac_cv_clock_monotonic= -# PR pkg/55456 -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" -.include "../../devel/libatomic/buildlink3.mk" -CONFIGURE_ENV.NetBSD+= ac_cv_needs_atomic=yes -.endif +.include "../../mk/atomic64.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" diff --git a/www/seamonkey/mozilla-common.mk b/www/seamonkey/mozilla-common.mk index e6fe0e39991..2267d3f67ae 100644 --- a/www/seamonkey/mozilla-common.mk +++ b/www/seamonkey/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.6 2020/12/23 08:19:30 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.7 2020/12/31 20:04:14 nia Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -54,8 +54,6 @@ TOOLS_PLATFORM.tar= ${TOOLS_PATH.bsdtar} USE_TOOLS+= bsdtar .endif .if ${MACHINE_ARCH} == "i386" -# Fix for PR pkg/48152. -CXXFLAGS+= -march=i586 # This is required for SSE2 code under i386. CXXFLAGS+= -mstackrealign .endif @@ -200,6 +198,7 @@ PLIST_SUBST+= DLL_SUFFIX=".dylib" PLIST_SUBST+= DLL_SUFFIX=".so" .endif +.include "../../mk/atomic64.mk" .include "../../archivers/bzip2/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/libevent/buildlink3.mk" diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 33e136259ae..e7a1ff4bb70 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.199 2020/12/15 17:59:00 leot Exp $ +# $NetBSD: Makefile,v 1.200 2020/12/31 20:04:14 nia Exp $ DISTNAME= webkitgtk-2.30.4 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} @@ -155,4 +155,5 @@ BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.42.2nb3 .include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/webkit-gtk/hacks.mk b/www/webkit-gtk/hacks.mk deleted file mode 100644 index 94abdb9a7db..00000000000 --- a/www/webkit-gtk/hacks.mk +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2020/09/11 09:21:32 he Exp $ - -.if !defined(WEBKIT_GTK_HACKS_MK) -WEBKIT_GTK_HACKS_MK= defined - -# [Sat Oct 3 16:44:53 CEST 2015 : leot] -# On i386 archs -latomic is added during the build phase when linking -# libwebkit2gtk-4.0.so for atomic operations. -# Forcing -march=i586 (or better) avoids that (i[56]86 provide required -# 64-bit compare-and-swap instruction). -.if ${MACHINE_ARCH} == "i386" -PKG_HACKS+= i386-atomicops -CXXFLAGS+= -march=i586 -.endif - -# [Mon Sep 7 20:40:36 CEST 2020 : he] -# On NetBSD/powerpc, we don't have native 8-byte atomics, -# but webkit-gtk insists on using them, so here we need libatomic. -# (This is a trial balloon -- let's see if autoconf will pick it up...) -.if ${MACHINE_ARCH} == "powerpc" -PKG_HACKS+= powerpc-libatomic -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.endif # WEBKIT_GTK_HACKS_MK diff --git a/www/webkit24-gtk/Makefile.common b/www/webkit24-gtk/Makefile.common index 3aab106fff5..8e5ee233662 100644 --- a/www/webkit24-gtk/Makefile.common +++ b/www/webkit24-gtk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2020/11/06 15:30:10 nia Exp $ +# $NetBSD: Makefile.common,v 1.20 2020/12/31 20:04:14 nia Exp $ # used by www/webkit24-gtk/Makefile # used by www/webkit24-gtk3/Makefile @@ -83,6 +83,7 @@ CPPFLAGS+= -DUSE_SYSTEM_MALLOC LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory .endif +.include "../../mk/atomic64.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/www/webkit24-gtk/hacks.mk b/www/webkit24-gtk/hacks.mk deleted file mode 100644 index 079768da0fc..00000000000 --- a/www/webkit24-gtk/hacks.mk +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2020/09/12 16:39:06 he Exp $ - -.if !defined(WEBKIT24_GTK_HACKS_MK) -WEBKIT24_GTK_HACKS_MK= defined - -# [Sun Mar 20 12:21:27 CET 2016 : leot] -# On i386 archs -latomic is added during the build phase and lead to a failure -# when linking various binaries/libraries. -# Forcing -march=i586 (or better) avoids that (i[56]86 provide required -# 64-bit compare-and-swap instruction). -.if ${MACHINE_ARCH} == "i386" -PKG_HACKS+= i386-atomicops -CXXFLAGS+= -march=i586 -.endif - -# [Fri Sep 11 11:23:52 CEST 2020 : he] -# On NetBSD/powerpc, we don't have native 8-byte atomics, -# but webkit24-gtk insists on using them, so here we need libatomic. -# (This is a trial balloon -- let's see if autoconf will pick it up...) -.if ${MACHINE_ARCH} == "powerpc" -PKG_HACKS+= powerpc-libatomic -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.endif # WEBKIT24_GTK_HACKS_MK diff --git a/www/webkit24-gtk3/hacks.mk b/www/webkit24-gtk3/hacks.mk deleted file mode 100644 index a348dfdfe2b..00000000000 --- a/www/webkit24-gtk3/hacks.mk +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2020/09/13 21:20:23 he Exp $ - -.if !defined(WEBKIT24_GTK3_HACKS_MK) -WEBKIT24_GTK3_HACKS_MK= defined - -# [Sun Mar 20 12:21:27 CET 2016 : leot] -# On i386 archs -latomic is added during the build phase and lead to a failure -# when linking various binaries/libraries. -# Forcing -march=i586 (or better) avoids that (i[56]86 provide required -# 64-bit compare-and-swap instruction). -.if ${MACHINE_ARCH} == "i386" -PKG_HACKS+= i386-atomicops -CXXFLAGS+= -march=i586 -.endif - -# [Fri Sep 11 11:23:52 CEST 2020 : he] -# On NetBSD/powerpc, we don't have native 8-byte atomics, -# but webkit24-gtk insists on using them, so here we need libatomic. -# (This is a trial balloon -- let's see if autoconf will pick it up...) -.if ${MACHINE_ARCH} == "powerpc" -PKG_HACKS+= powerpc-libatomic -.include "../../devel/libatomic/buildlink3.mk" -.endif - -.endif # WEBKIT24_GTK3_HACKS_MK diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile index 529c25d1310..cdef30932ab 100644 --- a/x11/qt5-qtwebkit/Makefile +++ b/x11/qt5-qtwebkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2020/11/21 23:13:11 wiz Exp $ +# $NetBSD: Makefile,v 1.85 2020/12/31 20:04:14 nia Exp $ QTWKVERSION= 5.212.0-alpha4 DISTNAME= qtwebkit-${QTWKVERSION} @@ -73,11 +73,6 @@ BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib LDFLAGS+= -Wl,--no-keep-memory .endif -# 64-bit atomic ops are required -.if ${MACHINE_ARCH} == "i386" -CXXFLAGS+= -march=i586 -.endif - post-install: .for i in Qt5WebKit.pc Qt5WebKitWidgets.pc cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ @@ -108,4 +103,5 @@ BUILDLINK_DEPMETHOD.${RUBY_BASE}= build .include "../../mk/curses.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} +.include "../../mk/atomic64.mk" .include "../../mk/bsd.pkg.mk" |