On 2021/07/29 20:27, Pascal Stumpf wrote:
> With the fix I just backported from https://reviews.llvm.org/D95994,
> we can get rid of these ugly workarounds.
diff is ok, but it's a bit soon to have ports rely on something that was
only just committed to base, please wait til tomorrow.
>
> Index: math/py-scipy/Makefile
> ===================================================================
> RCS file: /cvs/ports/math/py-scipy/Makefile,v
> retrieving revision 1.49
> diff -u -p -r1.49 Makefile
> --- math/py-scipy/Makefile 4 Jan 2021 14:06:35 -0000 1.49
> +++ math/py-scipy/Makefile 29 Jul 2021 18:27:23 -0000
> @@ -3,16 +3,9 @@
> 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
>
> Index: telephony/asterisk/Makefile
> ===================================================================
> RCS file: /cvs/ports/telephony/asterisk/Makefile,v
> retrieving revision 1.347
> diff -u -p -r1.347 Makefile
> --- telephony/asterisk/Makefile 23 Jul 2021 00:55:44 -0000 1.347
> +++ telephony/asterisk/Makefile 29 Jul 2021 18:27:23 -0000
> @@ -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
>
> Index: lang/gcc/8/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/gcc/8/Makefile,v
> retrieving revision 1.42
> diff -u -p -r1.42 Makefile
> --- lang/gcc/8/Makefile 9 Jun 2021 19:50:08 -0000 1.42
> +++ lang/gcc/8/Makefile 29 Jul 2021 18:27:23 -0000
> @@ -6,19 +6,12 @@ ONLY_FOR_ARCHS = aarch64 alpha amd64 arm
> # 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
>
