diff options
author | nia <nia@pkgsrc.org> | 2020-12-31 20:04:11 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-12-31 20:04:11 +0000 |
commit | f463db40c65bad3f65128ddcf5be6b3bf0337d5c (patch) | |
tree | 7bfa4e57ef6b84af56bd417dbec9fd094a6e383d /databases | |
parent | 3add785e86facdcafd3301cc7d879bd6c2d3bc37 (diff) | |
download | pkgsrc-f463db40c65bad3f65128ddcf5be6b3bf0337d5c.tar.gz |
Normalize handling packages that require 64-bit atomic ops.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/kyotocabinet/Makefile | 16 | ||||
-rw-r--r-- | databases/mysql57-client/Makefile.common | 9 | ||||
-rw-r--r-- | databases/mysql57-client/hacks.mk | 12 | ||||
-rw-r--r-- | databases/mysql57-server/hacks.mk | 12 | ||||
-rw-r--r-- | databases/redis/Makefile | 8 |
5 files changed, 6 insertions, 51 deletions
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" |