Remove USE_LLD=No hack on i386. A fix for the R_386_GOTOFF bug has been

backported.

ok sthen@
This commit is contained in:
pascal 2021-07-31 16:37:56 +00:00
parent 63a0163137
commit 7d63a0f078
3 changed files with 6 additions and 25 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2021/06/09 19:50:08 sthen Exp $
# $OpenBSD: Makefile,v 1.43 2021/07/31 16:37:56 pascal Exp $
ONLY_FOR_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el \
powerpc powerpc64 sparc64
@ -6,19 +6,12 @@ ONLY_FOR_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el \
# XXX: sparc64
ONLY_FOR_ARCHS-ada = amd64 hppa i386 mips64 powerpc
# XXX workaround for "ld: error: cp-demangle.c:(.debug_info+0x30115): has
# non-ABS relocation R_386_GOTOFF against symbol '.LC60'".
# If fixing, re-check telephony/asterisk math/py-scipy which had same issue
.if ${MACHINE_ARCH:Mi386}
USE_LLD = No
.endif
DPB_PROPERTIES = parallel
V = 8.4.0
FULL_VERSION = $V
FULL_PKGVERSION = $V
REVISION = 7
REVISION = 8
ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz
ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz

View File

@ -1,19 +1,12 @@
# $OpenBSD: Makefile,v 1.49 2021/01/04 14:06:35 sthen Exp $
# $OpenBSD: Makefile,v 1.50 2021/07/31 16:37:56 pascal Exp $
COMMENT= maths, science and engineering modules for Python
MODPY_EGG_VERSION= 1.5.3
REVISION= 0
REVISION= 1
DISTNAME= scipy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
# XXX gcc 8 issue:
# ld: error: dfft_subr_6.f:(.debug_loc+0x2A7D): has non-ABS relocation R_386_GOTOFF against symbol 'ntryh.3712'
# ld: error: dfft_subr_6.f:(.debug_loc+0x2A7D): has non-ABS relocation R_386_GOTOFF against symbol 'ntryh.3712'
.if ${MACHINE_ARCH} == i386
USE_LLD = No
.endif
CATEGORIES= math devel
# BSD

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.347 2021/07/23 00:55:44 sthen Exp $
# $OpenBSD: Makefile,v 1.348 2021/07/31 16:37:56 pascal Exp $
COMMENT-main= open source multi-protocol PBX and telephony toolkit
@ -7,12 +7,7 @@ PJ_V= 2.10
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} pjproject-${PJ_V}.tar.bz2:0
PKGNAME-main= asterisk-${VER}
.if ${MACHINE_ARCH} == i386
# i386 issue linking libasteriskpj.so.0.0:
# ld: error: cli_telnet.c:(.debug_info+0x1DF087): has non-ABS relocation R_386_GOTOFF against symbol 'CR_LF.6215'
USE_LLD= No
.endif
REVISION= 0
CATEGORIES= telephony