stop using -march=i686 for 64 bit atomics on i386

the now default -march=i586 includes 64 bit atomics
from Brad ok sthen@
This commit is contained in:
jsg 2020-08-07 14:30:10 +00:00
parent 66ffde49f8
commit 0e21764c1b
5 changed files with 13 additions and 30 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.97 2020/05/14 12:35:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.98 2020/08/07 14:30:10 jsg Exp $
ONLY_FOR_ARCHS= i386 amd64 aarch64
@ -8,7 +8,7 @@ V= 2.6.3
DISTNAME= darktable-$V
PORTROACH= limitw:1,even skipv:release-$V
EXTRACT_SUFX= .tar.xz
REVISION= 2
REVISION= 3
CATEGORIES= graphics x11
@ -72,8 +72,8 @@ NO_TEST= Yes
.include <bsd.port.arch.mk>
.if ${ARCH:Mi386}
# needs 64-bit atomic ops, and all the registers it can get.
CFLAGS += -march=i686 -fomit-frame-pointer
# needs all the registers it can get.
CFLAGS+= -fomit-frame-pointer
.endif
# ...and there's a hard requirement of SSE3
CFLAGS+= -msse3

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2020/05/14 12:35:31 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2020/08/07 14:30:10 jsg Exp $
BROKEN-i386 = clang segfault compiling imagebufalgo_pixelmath.cpp
BROKEN-powerpc = clang segfault compiling imagebufalgo_pixelmath.cpp
@ -10,7 +10,7 @@ GH_PROJECT = oiio
V = 1.8.6
GH_TAGNAME = Release-$V
DISTNAME = openimageio-${V}
REVISION = 7
REVISION = 8
SHARED_LIBS += OpenImageIO 5.0 # 1.0
SHARED_LIBS += OpenImageIO_Util 2.0 # 1.5
@ -56,9 +56,7 @@ CONFIGURE_ARGS += -DUSE_OPENCV=OFF \
-DSTOP_ON_WARNING=OFF
CXXFLAGS += -pthread
.if ${MACHINE_ARCH} == "i386"
CXXFLAGS += -march=i686
.endif
WRKDIST = ${WRKDIR}/oiio-Release-$V
# Fix undefined reference to __atomic_*

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.124 2020/07/29 07:06:41 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.125 2020/08/07 14:30:10 jsg Exp $
# patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
# patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
@ -16,6 +16,7 @@ COMMENT = GTK+ port of the WebKit rendering engine
V = 2.28.4
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
REVISION = 0
EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
@ -113,12 +114,6 @@ CXXFLAGS += -I${X11BASE}/include
LDFLAGS += -Wl,--no-keep-memory
.endif
# __sync_add_and_fetch_8
.if ${MACHINE_ARCH} == "i386"
CFLAGS += -march=i686
CXXFLAGS += -march=i686
.endif
.if ${MACHINE_ARCH} == "powerpc"
CFLAGS += -mlongcall
CXXFLAGS += -mlongcall

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.81 2020/06/24 17:56:43 cwen Exp $
# $OpenBSD: Makefile,v 1.82 2020/08/07 14:30:10 jsg Exp $
COMMENT= access, organize and share your photos on GNOME
GNOME_PROJECT= gnome-photos
GNOME_VERSION= 3.34.2
REVISION= 0
CATEGORIES= graphics
@ -44,11 +45,6 @@ RUN_DEPENDS += x11/gnome/grilo-plugins
# org.freedesktop.Tracker schema
RUN_DEPENDS += x11/gnome/tracker-miners
.if ${MACHINE_ARCH} == i386
# undefined reference to `__sync_add_and_fetch_8'
CFLAGS += -march=i686
.endif
DEBUG_PACKAGES= ${BUILD_PACKAGES}
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2020/06/09 22:43:16 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2020/08/07 14:30:10 jsg Exp $
COMMENT = QtWebKit with a more modern WebKit code base
@ -14,7 +14,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH= 0
REVISION = 0
REVISION = 1
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
@ -124,12 +124,6 @@ CONFIGURE_ARGS += -DENABLE_LLINT_C_LOOP=ON
LDFLAGS += -Wl,--no-keep-memory
.endif
# __sync_add_and_fetch_8
.if ${MACHINE_ARCH} == "i386"
CFLAGS += -march=i686
CXXFLAGS += -march=i686
.endif
post-install:
find ${WRKINST} -type f -exec perl -pi -e 's,${WRKINST},,g;' {} +