Stop hardcoding -O3 -march=native, respect CXXFLAGS/LDFLAGS

Spotted on riscv64 where -march=native isn't supported.
ok sdk@ (maintainer)
This commit is contained in:
jca 2022-01-27 00:32:39 +00:00
parent 081c23e366
commit 28b0d9fa0a
2 changed files with 24 additions and 1 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2022/01/14 19:25:17 sdk Exp $
# $OpenBSD: Makefile,v 1.2 2022/01/27 00:32:39 jca Exp $
COMMENT = X terminal which uses OpenGL ES Compute Shaders
GH_ACCOUNT = tomszilagyi
GH_PROJECT = zutty
GH_TAGNAME = 0.11
REVISION = 0
CATEGORIES = x11
@ -22,6 +23,10 @@ WANTLIB += Xext Xmu Xt c freetype m xcb z
COMPILER= base-clang ports-gcc
CONFIGURE_ENV = CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
do-configure:
cd ${WRKSRC} && env -i ${CONFIGURE_ENV} \
${MODPY_BIN} ./waf configure --prefix=${PREFIX}

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-wscript,v 1.1 2022/01/27 00:32:39 jca Exp $
Respect CXXFLAGS/LDFLAGS.
Index: wscript
--- wscript.orig
+++ wscript
@@ -69,10 +69,6 @@ def configure(cfg):
['-DDEBUG', '-Og', '-g', '-ggdb'])
else:
cfg.env.target = 'zutty'
- cfg.env.append_value('CXXFLAGS',
- ['-Werror', '-O3', '-march=native', '-mtune=native', '-flto'])
- cfg.env.append_value('LINKFLAGS',
- ['-flto'])
cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'],
uselib_store='FT')