Page MenuHomeFreeBSD

games/fs2open: fix linking on 12.0 and higher when using LLVM
ClosedPublic

Authored by pkubaj on May 15 2019, 10:21 PM.
Tags
None
Referenced Files
F86560272: D20268.id.diff
Sat, Jun 22, 5:05 AM
F86559145: D20268.id.diff
Sat, Jun 22, 4:37 AM
Unknown Object (File)
Wed, Jun 19, 2:30 AM
Unknown Object (File)
Sun, Jun 16, 6:35 AM
Unknown Object (File)
May 7 2024, 12:18 AM
Unknown Object (File)
May 2 2024, 10:04 AM
Unknown Object (File)
May 2 2024, 10:04 AM
Unknown Object (File)
May 2 2024, 10:04 AM
Subscribers

Details

Summary

This port was tested on 11.2-RELEASE (the oldest supported version) on amd64 and 12.0-RELEASE on powerpc64. Since 12.0-RELEASE amd64 uses lld.

This port doesn't link with lld. Fix that (LLD_UNSAFE doesn't work) and remove additional -march=native.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Though, the last two patches should be excluded, nothing in them changes really.

This revision is now accepted and ready to land.May 16 2019, 6:58 AM
tobik added inline comments.
games/fs2open/files/patch-cmake_toolchain-clang.cmake
19 ↗(On Diff #57423)

FreeBSD 13.0 does not have ld.bfd in base anymore, so committing this would break the build there. Either add something like

.if !exists(/usr/bin/ld.bfd)
USE_BINUTILS=	yes
.endif

or make sure the build respects LDFLAGS so that LLD_UNSAFE=yes can actually work.

This revision now requires review to proceed.May 17 2019, 10:32 PM

Looks good to me and builds fine on 13.0/amd64, thanks.

I'd bump PORTREVISION too to trigger a rebuild since the build is without -march=native now and because CFLAGS, CXXFLAGS, LDFLAGS are actually respected by the build now.

games/fs2open/files/patch-freespace2_CMakeLists.txt
1–3 ↗(On Diff #57511)

Remove this patch from the lot, no functional changes. (I am looking at fixing makepatch to avoid keeping those patches.)

games/fs2open/files/patch-freespace2_CMakeLists.txt
1–3 ↗(On Diff #57511)

Fixed in rP502102.

Remove patch that doesn't change anything.

This revision is now accepted and ready to land.Jun 8 2019, 5:19 PM
This revision was automatically updated to reflect the committed changes.