Disable i386 assembly to avoid a text relocation fixing
the lld build.  This also fixes building with PIE and LTO on i386.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/eduke32/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile    4 Sep 2018 12:46:12 -0000       1.18
+++ Makefile    11 Nov 2018 07:50:35 -0000
@@ -5,7 +5,7 @@ RDATE =         20171105
 RTAG =         6496
 DISTNAME =     eduke32_src_${RDATE}-${RTAG}
 PKGNAME =      eduke32-2.0.0.${RTAG}
-REVISION =     1
+REVISION =     2
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   games x11
 
@@ -21,10 +21,6 @@ PERMIT_DISTFILES_FTP =  "BUILD engine li
 BUILD_DEPENDS = archivers/unzip \
                graphics/gdk-pixbuf2
 
-.if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS += devel/nasm
-.endif
-
 WANTLIB += c m ogg pthread vorbis vorbisfile vpx lz4
 WANTLIB += SDL2 SDL2_mixer FLAC execinfo ${COMPILER_LIBCXX}
 
@@ -52,7 +48,8 @@ MAKE_FLAGS += PRETTY_OUTPUT=0 \
                CXX="${CXX}" \
                STRIP=true \
                PACKAGE_REPOSITORY=1 \
-               HAVE_XMP=0
+               HAVE_XMP=0 \
+               NOASM=1
 MAKE_FILE =    GNUmakefile
 USE_GMAKE =    Yes
 NO_TEST =      Yes
@@ -92,18 +89,8 @@ do-install:
        ${INSTALL_DATA} ${WRKDIST}/package/sdk/samples/* \
                ${PREFIX}/share/examples/eduke32/
 
-.if ${MACHINE_ARCH:Mi386}
-CFLAGS +=      -fno-pie
-MAKE_FLAGS +=  MISCLINKOPTS=-nopie
-.endif
-
 .include <bsd.port.mk>
 .if ${PROPERTIES:Mclang}
-.  if ${MACHINE_ARCH} == i386
-# disable LTO, ld.lld doesn't work here on i386
-MAKE_FLAGS +=  LTO=0
-.  else
 # lto doesn't work with binutils, at all
 MAKE_FLAGS +=  LDFLAGS=-fuse-ld=/usr/bin/ld.lld
-.  endif
 .endif

Reply via email to