pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Normalize handling packages that require 64-bit atomic...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c45c538b7ef
branches: trunk
changeset: 443906:3c45c538b7ef
user: nia <nia%pkgsrc.org@localhost>
date: Thu Dec 31 20:04:11 2020 +0000
description:
Normalize handling packages that require 64-bit atomic ops.
diffstat:
audio/audacity/Makefile | 13 ++-----------
audio/cmus/Makefile | 13 ++-----------
databases/kyotocabinet/Makefile | 16 ++--------------
databases/mysql57-client/Makefile.common | 9 ++-------
databases/mysql57-client/hacks.mk | 12 ------------
databases/mysql57-server/hacks.mk | 12 ------------
databases/redis/Makefile | 8 ++------
devel/protobuf/Makefile | 8 ++------
devel/protobuf/hacks.mk | 14 --------------
emulators/libretro-parallel-n64/Makefile | 7 ++-----
games/lgogdownloader/Makefile | 10 ++--------
games/supertuxkart/Makefile | 17 ++---------------
graphics/inkscape/Makefile | 12 ++----------
lang/mozjs78/Makefile | 19 ++++---------------
lang/nodejs/Makefile | 5 ++---
lang/nodejs12/Makefile | 5 ++---
misc/libreoffice/Makefile | 9 ++-------
mk/atomic64.mk | 24 ++++++++++++++++++++++++
multimedia/lightspark/Makefile | 9 ++-------
multimedia/mpv/Makefile | 15 ++-------------
net/filezilla/Makefile | 9 ++-------
net/freeradius/Makefile | 3 ++-
net/freeradius/hacks.mk | 19 -------------------
net/frr/Makefile | 9 ++-------
net/grpc/Makefile | 11 ++---------
print/qpdf/Makefile | 3 ++-
print/qpdf/hacks.mk | 23 -----------------------
sysutils/rsyslog/Makefile | 8 ++------
www/firefox/mozilla-common.mk | 11 +++--------
www/firefox52/mozilla-common.mk | 5 ++---
www/firefox68/mozilla-common.mk | 5 ++---
www/firefox78/mozilla-common.mk | 10 ++--------
www/seamonkey/mozilla-common.mk | 5 ++---
www/webkit-gtk/Makefile | 3 ++-
www/webkit-gtk/hacks.mk | 25 -------------------------
www/webkit24-gtk/Makefile.common | 3 ++-
www/webkit24-gtk/hacks.mk | 25 -------------------------
www/webkit24-gtk3/hacks.mk | 25 -------------------------
x11/qt5-qtwebkit/Makefile | 8 ++------
39 files changed, 87 insertions(+), 360 deletions(-)
diffs (truncated from 1024 to 300 lines):
diff -r 548ec86e1e63 -r 3c45c538b7ef audio/audacity/Makefile
--- a/audio/audacity/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/audio/audacity/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
.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 @@
.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 -r 548ec86e1e63 -r 3c45c538b7ef audio/cmus/Makefile
--- a/audio/cmus/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/audio/cmus/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
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 -r 548ec86e1e63 -r 3c45c538b7ef databases/kyotocabinet/Makefile
--- a/databases/kyotocabinet/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/databases/kyotocabinet/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
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 -r 548ec86e1e63 -r 3c45c538b7ef databases/mysql57-client/Makefile.common
--- a/databases/mysql57-client/Makefile.common Thu Dec 31 19:44:25 2020 +0000
+++ b/databases/mysql57-client/Makefile.common Thu Dec 31 20:04:11 2020 +0000
@@ -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_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 @@
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/atomic64.mk"
diff -r 548ec86e1e63 -r 3c45c538b7ef databases/mysql57-client/hacks.mk
--- a/databases/mysql57-client/hacks.mk Thu Dec 31 19:44:25 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 548ec86e1e63 -r 3c45c538b7ef databases/mysql57-server/hacks.mk
--- a/databases/mysql57-server/hacks.mk Thu Dec 31 19:44:25 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 548ec86e1e63 -r 3c45c538b7ef databases/redis/Makefile
--- a/databases/redis/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/databases/redis/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
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 @@
cd ${WRKSRC} && ${SH} runtest
.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/atomic64.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 548ec86e1e63 -r 3c45c538b7ef devel/protobuf/Makefile
--- a/devel/protobuf/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/devel/protobuf/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
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 @@
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 -r 548ec86e1e63 -r 3c45c538b7ef devel/protobuf/hacks.mk
--- a/devel/protobuf/hacks.mk Thu Dec 31 19:44:25 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 548ec86e1e63 -r 3c45c538b7ef emulators/libretro-parallel-n64/Makefile
--- a/emulators/libretro-parallel-n64/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/emulators/libretro-parallel-n64/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
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 -r 548ec86e1e63 -r 3c45c538b7ef games/lgogdownloader/Makefile
--- a/games/lgogdownloader/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/games/lgogdownloader/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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_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 @@
.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 -r 548ec86e1e63 -r 3c45c538b7ef games/supertuxkart/Makefile
--- a/games/supertuxkart/Makefile Thu Dec 31 19:44:25 2020 +0000
+++ b/games/supertuxkart/Makefile Thu Dec 31 20:04:11 2020 +0000
@@ -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 @@
# 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"
Home |
Main Index |
Thread Index |
Old Index