Date: Thu, 19 Mar 2020 23:02:31 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528750 - in head: audio/alure audio/freealut audio/openal-soft devel/love07 devel/love08 emulators/fs-uae emulators/pcem emulators/rpcs3 games/OpenTomb games/allacrost games/apricots g... Message-ID: <202003192302.02JN2ViL053774@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Mar 19 23:02:30 2020 New Revision: 528750 URL: https://svnweb.freebsd.org/changeset/ports/528750 Log: Clean up LLD_UNSAFE from openal-soft ports After FreeBSD 12.0 EOL we no longer have to worry about LLD 6 and can drop LLD_UNSAFE from openal-soft ports. LLD can link them fine now but some ports needs a little help on i386 (-Wl,-znotext). PR: 226980 Reviewed by: jbeich (earlier version) Differential Revision: https://reviews.freebsd.org/D23030 Modified: head/audio/alure/Makefile head/audio/freealut/Makefile head/audio/openal-soft/Makefile head/devel/love07/Makefile head/devel/love08/Makefile head/emulators/fs-uae/Makefile head/emulators/pcem/Makefile head/emulators/rpcs3/Makefile head/games/OpenTomb/Makefile head/games/allacrost/Makefile head/games/apricots/Makefile head/games/aquaria/Makefile head/games/arx-libertatis/Makefile head/games/assaultcube/Makefile head/games/astromenace/Makefile head/games/atr3d/Makefile head/games/avp/Makefile head/games/barony/Makefile head/games/blackshadeselite/Makefile head/games/chromium-bsu/Makefile head/games/colobot/Makefile head/games/dhewm3/Makefile head/games/diaspora/Makefile head/games/el/Makefile head/games/endless-sky/Makefile head/games/excido/Makefile head/games/flightgear/Makefile head/games/freedoko/Makefile head/games/freeminer/Makefile head/games/freeorion/Makefile head/games/fs2open/Makefile head/games/glest/Makefile head/games/ioquake3/Makefile head/games/iortcw/Makefile head/games/irrlamb/Makefile head/games/keeperrl/Makefile head/games/linwarrior/Makefile head/games/lugaru/Makefile head/games/megaglest/Makefile head/games/minetest/Makefile head/games/naev/Makefile head/games/openclonk/Makefile head/games/openomf/Makefile head/games/opensurge/Makefile head/games/regoth/Makefile head/games/retroarch/Makefile head/games/scorched3d/Makefile head/games/spacezero/Makefile head/games/spring/Makefile head/games/springlobby/Makefile head/games/stuntrally/Makefile head/games/supertux2/Makefile head/games/supertuxkart/Makefile head/games/tome4/Makefile head/games/trigger-rally/Makefile head/games/ultimatestunts/Makefile head/games/valyriatear/Makefile head/games/vamos/Makefile head/graphics/magnum-examples/Makefile head/graphics/reallyslick/Makefile head/multimedia/mpv/Makefile head/net-im/toxic/Makefile Modified: head/audio/alure/Makefile ============================================================================== --- head/audio/alure/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/audio/alure/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= cmake compiler:c++11-lang openal:soft pkgconfig USE_LDCONFIG= yes -LLD_UNSAFE= yes # lld disallows preemption of protected visibility syms CMAKE_OFF= BUILD_DOCS BUILD_STATIC +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTEXAMPLES= * Modified: head/audio/freealut/Makefile ============================================================================== --- head/audio/freealut/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/audio/freealut/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -16,7 +16,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES= gmake libtool openal:al pathfix pkgconfig USE_LDCONFIG= yes -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext INSTALL_TARGET= install-strip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/audio/openal-soft/Makefile ============================================================================== --- head/audio/openal-soft/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/audio/openal-soft/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -24,10 +24,6 @@ CMAKE_ON= ALSOFT_BACKEND_WAVE ALSOFT_UTILS # do not link with librt and libdl. LDFLAGS+= -Wl,--as-needed LDFLAGS_i386= -Wl,-z,notext -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes -.endif PLIST_SUB= SOVERSION=${PORTVERSION} Modified: head/devel/love07/Makefile ============================================================================== --- head/devel/love07/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/devel/love07/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -32,7 +32,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib \ --program-suffix=07 WRKSRC= ${WRKDIR}/love-HEAD Modified: head/devel/love08/Makefile ============================================================================== --- head/devel/love08/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/devel/love08/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -30,7 +30,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -I${LUA_INCDIR} `${SDL_CONFIG} --cflags` LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext CONFIGURE_ARGS= --bindir=${PREFIX}/bin --libdir=${PREFIX}/lib \ --program-suffix=08 WRKSRC= ${WRKDIR}/love-${PORTVERSION} Modified: head/emulators/fs-uae/Makefile ============================================================================== --- head/emulators/fs-uae/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/emulators/fs-uae/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -25,11 +25,11 @@ USE_GL= gl USE_GNOME= glib20 USE_XORG= x11 -LLD_UNSAFE= yes INSTALLS_ICONS= yes GNU_CONFIGURE= yes CFLAGS+= -Wno-c++11-narrowing +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DOCS DEBUG OPTIONS_DEFINE_i386= JIT Modified: head/emulators/pcem/Makefile ============================================================================== --- head/emulators/pcem/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/emulators/pcem/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -23,10 +23,4 @@ CONFIGURE_ARGS= --enable-release-build --with-wx-confi GNU_CONFIGURE= yes ONLY_FOR_ARCHS= amd64 -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 -LDFLAGS+= -fuse-ld=bfd -.endif - .include <bsd.port.mk> Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/emulators/rpcs3/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -44,11 +44,6 @@ CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTE CMAKE_OFF= USE_NATIVE_INSTRUCTIONS LDFLAGS+= -Wl,--as-needed # GLU -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes # XXX ports/219089 -.endif - # XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01 .if make(makesum) || (!exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)) MASTER_SITES+= https://releases.llvm.org/${LLVM_VER}/:libcxx Modified: head/games/OpenTomb/Makefile ============================================================================== --- head/games/OpenTomb/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/OpenTomb/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -18,7 +18,7 @@ LIB_DEPENDS= libpng.so:graphics/png USES= cmake:insource compiler:c++11-lang lua openal sdl USE_GITHUB= yes USE_SDL= sdl2 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext SUB_FILES= OpenTomb post-patch: Modified: head/games/allacrost/Makefile ============================================================================== --- head/games/allacrost/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/allacrost/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -29,7 +29,7 @@ USE_CXXSTD= c++98 CONFIGURE_ARGS= --datadir=${DATADIR} --enable-editor=no CPPFLAGS+= -isystem${LUA_INCDIR} LDFLAGS+= -L${LUA_LIBDIR} -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/games/apricots/Makefile ============================================================================== --- head/games/apricots/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/apricots/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -21,7 +21,7 @@ PLIST_FILES= bin/${PORTNAME} libexec/${PORTNAME} PORTDATA= * PORTDOCS= * CPPFLAGS+= -DAP_PATH="\"${DATADIR}/\"" -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext DESKTOP_ENTRIES="Apricots" \ "${COMMENT}" \ Modified: head/games/aquaria/Makefile ============================================================================== --- head/games/aquaria/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/aquaria/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -42,11 +42,6 @@ SUB_FILES= pkg-message PLIST_FILES= bin/aquaria PORTDATA= * -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes # XXX ports/219089 -.endif - DESKTOP_ENTRIES="${GH_PROJECT}" \ "" \ "${DATADIR}/${PORTNAME}.png" \ Modified: head/games/arx-libertatis/Makefile ============================================================================== --- head/games/arx-libertatis/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/arx-libertatis/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -20,10 +20,10 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/foreach.hpp: USES= cmake compiler:c++11-lang gl openal sdl tar:xz USE_SDL= sdl USE_GL= gl glew -LLD_UNSAFE= yes CMAKE_ARGS= -DDATA_DIR=arx \ -DSTRICT_USE=ON \ -DBUILD_CRASHREPORTER=OFF +LDFLAGS_i386= -Wl,-znotext SUB_FILES= pkg-message Modified: head/games/assaultcube/Makefile ============================================================================== --- head/games/assaultcube/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/assaultcube/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -24,7 +24,7 @@ LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror p LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept USES= gmake tar:bzip2 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/source/src SUB_FILES= ${PLIST_FILES:Mbin/*:T} Modified: head/games/astromenace/Makefile ============================================================================== --- head/games/astromenace/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/astromenace/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -29,7 +29,7 @@ DOS2UNIX_FILES= CMakeLists.txt src/config/config.cpp USE_GL= gl glu USE_SDL= sdl2 CMAKE_ARGS= -DDATADIR="${DATADIR}" -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * Modified: head/games/atr3d/Makefile ============================================================================== --- head/games/atr3d/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/atr3d/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= OPENAL OPTIONS_DEFAULT=OPENAL Modified: head/games/avp/Makefile ============================================================================== --- head/games/avp/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/avp/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -17,7 +17,8 @@ USES= cmake compiler:c++11-lang gl openal sdl USE_GL= gl USE_SDL= sdl -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext + PLIST_FILES= bin/${PORTNAME} do-install: Modified: head/games/barony/Makefile ============================================================================== --- head/games/barony/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/barony/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -28,7 +28,7 @@ CMAKE_ON= OPENAL_ENABLED DATA_DIR CMAKE_ARGS= -DEDITOR_EXE_NAME:STRING="barony-editor" DOS2UNIX_FILES= src/menu.cpp LDFLAGS+= -Wl,--as-needed -LLD_UNSAFE= yes # cf. PR 226980 +LDFLAGS_i386= -Wl,-znotext SUB_FILES= pkg-message Modified: head/games/blackshadeselite/Makefile ============================================================================== --- head/games/blackshadeselite/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/blackshadeselite/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -21,9 +21,8 @@ USE_CXXSTD= c++98 USE_SDL= sdl USE_GL= gl glu -LLD_UNSAFE= yes - MAKE_ARGS= CC="${CC}" CXX="${CXX}" +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/games/chromium-bsu/Makefile ============================================================================== --- head/games/chromium-bsu/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/chromium-bsu/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -26,8 +26,8 @@ CONFIGURE_ARGS= --disable-sdl \ --disable-ftgl \ --disable-glut \ --disable-glpng -LLD_UNSAFE= yes MAKE_ARGS= LDFLAGS="${LDFLAGS}" +LDFLAGS_i386= -Wl,-znotext INSTALLS_ICONS= yes Modified: head/games/colobot/Makefile ============================================================================== --- head/games/colobot/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/colobot/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -35,7 +35,7 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_TUPLE= colobot:colobot-data:c467bd9:data -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext post-extract: @${MV} ${WRKDIR}/colobot-data-c467bd9/* ${WRKSRC}/data Modified: head/games/dhewm3/Makefile ============================================================================== --- head/games/dhewm3/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/dhewm3/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -21,7 +21,8 @@ GH_ACCOUNT= dhewm USES= cmake compiler:c++11-lang jpeg openal:al sdl USE_SDL= sdl2 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext WRKSRC_SUBDIR= neo Modified: head/games/diaspora/Makefile ============================================================================== --- head/games/diaspora/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/diaspora/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -39,7 +39,8 @@ USE_CXXSTD= gnu++98 USE_GL= gl glu USE_SDL= sdl GNU_CONFIGURE= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext WRKDIR_DIASPORA=${WRKDIR}/Diaspora_R1_Linux/Diaspora WRKSRC= ${WRKDIR_DIASPORA}/fs2_open Modified: head/games/el/Makefile ============================================================================== --- head/games/el/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/el/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -25,7 +25,7 @@ USE_GITHUB= yes GH_ACCOUNT= raduprv GH_PROJECT= Eternal-Lands LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -lX11 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext ALL_TARGET= el.bin MAKEFILE= Makefile.bsd Modified: head/games/endless-sky/Makefile ============================================================================== --- head/games/endless-sky/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/endless-sky/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -22,7 +22,8 @@ USES= compiler:c++11-lang gl gnome jpeg localbase:ldf USE_SDL= sdl2 USE_GL= gl glew INSTALLS_ICONS= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDATA= * Modified: head/games/excido/Makefile ============================================================================== --- head/games/excido/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/excido/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -22,7 +22,7 @@ USES= compiler:c++11-lang gl gmake openal:al,alut sdl USE_GL= gl glu USE_SDL= image sdl ttf -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DOCS Modified: head/games/flightgear/Makefile ============================================================================== --- head/games/flightgear/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/flightgear/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -34,14 +34,13 @@ USES= alias cmake:noninja compiler:c++11-lang cpe dos USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut -LLD_UNSAFE= yes - DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DSYSTEM_SQLITE:BOOL=ON \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DBUS QT5 OPTIONS_DEFAULT= DBUS QT5 Modified: head/games/freedoko/Makefile ============================================================================== --- head/games/freedoko/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/freedoko/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -21,7 +21,6 @@ USES= compiler:c++14-lang gettext-runtime gettext-too USE_CXXSTD= c++14 USE_GNOME= gdkpixbuf2 gtkmm30 -LLD_UNSAFE= yes MAKE_ENV= OS="${OPSYS}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" OPTIONS_DEFINE= DOCS NETWORK OPENAL @@ -35,6 +34,8 @@ OPENAL_USES= openal:al,alut OPENAL_MAKE_ENV= INCLUDE_SOUND_ALUT="$$(pkg-config --cflags freealut)" \ LIBS_SOUND_ALUT="$$(pkg-config --libs freealut)" \ USE_SOUND=true USE_SOUND_ALUT=true +OPENAL_LDFLAGS= ${_OPENAL_LDFLAGS_${ARCH}} +_OPENAL_LDFLAGS_i386= -Wl,-znotext post-patch: @${REINPLACE_CMD} -e \ Modified: head/games/freeminer/Makefile ============================================================================== --- head/games/freeminer/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/freeminer/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -18,10 +18,10 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 USE_GITHUB= yes USES= compiler:c++11-lib cmake -LLD_UNSAFE= yes CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \ -DRUN_IN_PLACE=0 +LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * Modified: head/games/freeorion/Makefile ============================================================================== --- head/games/freeorion/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/freeorion/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -21,7 +21,8 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ USE_GITHUB= yes USES= cmake compiler:c++14-lang python:2.7 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= ChangeLog.md README.md PORTDATA= * Modified: head/games/fs2open/Makefile ============================================================================== --- head/games/fs2open/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/fs2open/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -17,7 +17,6 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libpng.so:graphics/png USES= cmake compiler:c++11-lang lua:51 jpeg openal pkgconfig sdl -LLD_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= scp-fs2open GH_PROJECT= fs2open.github.com @@ -27,6 +26,8 @@ USE_SDL= sdl2 CMAKE_OFF= ENABLE_COTIRE CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen + +LDFLAGS_i386= -Wl,-znotext PLIST_FILES= bin/fs2_open Modified: head/games/glest/Makefile ============================================================================== --- head/games/glest/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/glest/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -23,9 +23,9 @@ USES= autoreconf:build compiler:c++11-lang dos2unix g USE_SDL= sdl USE_GL= gl glu USE_XORG= x11 -LLD_UNSAFE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= mk/linux/configure +LDFLAGS_i386= -Wl,-znotext SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -q -a -dx Modified: head/games/ioquake3/Makefile ============================================================================== --- head/games/ioquake3/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/ioquake3/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -53,7 +53,7 @@ MAKE_ARGS+= DEFAULT_BASEDIR="${Q3DIR}" \ TOOLS_CC="${CC}" \ USE_LOCAL_HEADERS=0 ALL_TARGET= release -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext LIBDIR= lib/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= share/doc/${PORTNAME}${PKGNAMESUFFIX} Modified: head/games/iortcw/Makefile ============================================================================== --- head/games/iortcw/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/iortcw/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -29,8 +29,7 @@ WOLFDIR= "libexec/${PORTNAME}" MAKE_ARGS= BINDIR="${STAGEDIR}${PREFIX}/bin" \ COPYDIR="${STAGEDIR}${PREFIX}/${WOLFDIR}" -# cf. PR 226980 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext PLIST_SUB= ARCH="${ARCH}" \ WOLFDIR="${WOLFDIR}" Modified: head/games/irrlamb/Makefile ============================================================================== --- head/games/irrlamb/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/irrlamb/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -24,7 +24,8 @@ USE_GITHUB= yes GH_ACCOUNT= jazztickets USES= cmake compiler:c++11-lib lua:53 openal -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * Modified: head/games/keeperrl/Makefile ============================================================================== --- head/games/keeperrl/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/keeperrl/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -29,11 +29,12 @@ USE_SDL= sdl2 image2 ALPHA_VERSION= 23 LIBS+= -lexecinfo -LLD_UNSAFE= yes MAKE_ARGS= DATA_DIR="${DATADIR}" GCC="${CXX}" \ LDFLAGS="${LDFLAGS}" RELEASE=true # USE_GCC adds -Wl,-rpath=${_GCC_RUNTIME} which breaks -x c++-header MAKE_ARGS+= PCH= PCHINC= + +LDFLAGS_i386= -Wl,-znotext DESKTOP_ENTRIES="KeeperRL" "" "" "keeper" \ "Game;Simulation;" false Modified: head/games/linwarrior/Makefile ============================================================================== --- head/games/linwarrior/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/linwarrior/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -15,8 +15,9 @@ COMMENT= Navigate a mech through a 3D world and fire a USES= compiler:c++11-lang gl gmake openal:al,alut sdl USE_GL= gl glu USE_SDL= sdl -LLD_UNSAFE= yes USE_CXXSTD= gnu++98 + +LDFLAGS_i386= -Wl,-znotext WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/games/lugaru/Makefile ============================================================================== --- head/games/lugaru/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/lugaru/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -22,7 +22,8 @@ USES= cmake compiler:c++11-lang gl jpeg openal:soft p USE_GL= gl glu USE_SDL= sdl USE_XORG= sm -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= README OPTIONS_DEFINE= DOCS Modified: head/games/megaglest/Makefile ============================================================================== --- head/games/megaglest/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/megaglest/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -35,9 +35,9 @@ USE_GL= glew gl glu USE_SDL= sdl2 USE_XORG= sm ice x11 xext USE_CXXSTD= c++11 -LLD_UNSAFE= yes LDFLAGS+= -lssl -lcrypto +LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= EDITOR DOCS VIEWER OPTIONS_SUB= yes Modified: head/games/minetest/Makefile ============================================================================== --- head/games/minetest/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/minetest/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -18,9 +18,10 @@ USE_GITHUB= yes GH_ACCOUNT= minetest USES= cmake compiler:c11 iconv:wchar_t -LLD_UNSAFE= yes CMAKE_ARGS= -DCUSTOM_MANDIR="${PREFIX}/man" \ -DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" + +LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * Modified: head/games/naev/Makefile ============================================================================== --- head/games/naev/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/naev/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -54,7 +54,6 @@ LUA_JIT_DESC= Use LuaJIT from lang/luajit LUA_JIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit OPENAL_USES= openal OPENAL_CONFIGURE_WITH= openal -OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980 SDL_MIXER_DESC= SDL_mixer sound backend SDL_MIXER_CONFIGURE_WITH= sdlmixer SDL2_DESC= Use SDL2 instead of SDL Modified: head/games/openclonk/Makefile ============================================================================== --- head/games/openclonk/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/openclonk/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -35,7 +35,7 @@ USE_SDL= sdl2 USE_XORG= x11 xpm INSTALLS_ICONS= yes CMAKE_ARGS= -DAudio_TK:STRING="OpenAL" -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext post-patch: @${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \ Modified: head/games/openomf/Makefile ============================================================================== --- head/games/openomf/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/openomf/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -27,7 +27,8 @@ GH_TUPLE= omf2097:libShadowDive:b2c34a6:shadow \ USES= cmake:insource compiler:c++11-lang gettext openal sdl USE_SDL= sdl2 -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext DESKTOP_ENTRIES="OpenOMF" "" \ "${PREFIX}/share/openomf/openomf_icon.png " \ Modified: head/games/opensurge/Makefile ============================================================================== --- head/games/opensurge/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/opensurge/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -40,7 +40,8 @@ SUB_FILES= ${PORTNAME} DESKTOP_ENTRIES="Open Surge" "" "${PORTNAME}" \ "${PORTNAME}" "Game;ArcadeGame;" "" INSTALLS_ICONS= yes -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext SVN_REV= 765 MODS_VER= 20140321 Modified: head/games/regoth/Makefile ============================================================================== --- head/games/regoth/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/regoth/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -35,9 +35,8 @@ GH_TUPLE= ataulien:bgfx-cmake:9a9b596:bgfxcmake/lib/bg USE_XORG= ice sm x11 xcursor xext xinerama xrandr USE_GL= gl glu -# OpenAL https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219089 -LLD_UNSAFE= yes CMAKE_ARGS+= -DREGOTH_BUILD_WITH_SYSTEM_OPENAL:BOOL=YES +LDFLAGS_i386= -Wl,-znotext post-extract: ${MV} ${WRKSRC_bgfx}/* ${WRKSRC}/lib/bgfx-cmake/bgfx Modified: head/games/retroarch/Makefile ============================================================================== --- head/games/retroarch/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/retroarch/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -57,6 +57,7 @@ FBO_CONFIGURE_ENABLE= fbo CFLAGS+= -pthread LDFLAGS+= -pthread +LDFLAGS_i386= -Wl,-znotext CONFIGURE_ARGS+=--enable-threads CONFIGURE_ENV+= MAN_DIR=${MANPREFIX}/man @@ -67,7 +68,6 @@ SUB_FILES= pkg-message GNU_CONFIGURE= yes CONFIGURE_ARGS+=--global-config-dir=${LOCALBASE}/etc USE_XORG= x11 xcb xext xinerama xv xxf86vm -LLD_UNSAFE= yes SHEBANG_FILES= libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py tools/cg2glsl.py tools/vulkan_loader_generator.py post-patch: Modified: head/games/scorched3d/Makefile ============================================================================== --- head/games/scorched3d/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/scorched3d/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -31,12 +31,12 @@ USE_WX= 2.8 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} -LLD_UNSAFE= yes DOS2UNIX_GLOB= *.h *.cpp CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS_i386= -Wl,-znotext SCORCH_VERSION= 43.3d SCORCH_REVISION= # none Modified: head/games/spacezero/Makefile ============================================================================== --- head/games/spacezero/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/spacezero/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -17,7 +17,6 @@ LIB_DEPENDS= libvorbisfile.so:audio/libvorbis USES= openal:al,alut gnome pkgconfig xorg USE_GNOME= gtk20 USE_XORG= x11 -LLD_UNSAFE= yes MAKE_ARGS= DATADIR="${DATADIR}" \ INSTALL_DATA_DIR="${DATADIR}" ALL_TARGET= ${PORTNAME} @@ -25,6 +24,7 @@ ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME} LDFLAGS+= -lX11 +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * Modified: head/games/spring/Makefile ============================================================================== --- head/games/spring/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/spring/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -30,7 +30,6 @@ USE_SDL= sdl2 USE_GL= gl glu glew USE_XORG= x11 xcursor USE_LDCONFIG= yes -LLD_UNSAFE= yes DOS2UNIX_GLOB= *.h *.hpp *.cpp USES= cmake:insource compiler:c++11-lib dos2unix gl openal:al sdl \ Modified: head/games/springlobby/Makefile ============================================================================== --- head/games/springlobby/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/springlobby/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -22,7 +22,6 @@ USES= cmake compiler:c++11-lib pkgconfig tar:bzip2 CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DENABLE_DEBUG_REPORT=FALSE USE_WX= 2.8+ -LLD_UNSAFE= yes PORTDOCS= * Modified: head/games/stuntrally/Makefile ============================================================================== --- head/games/stuntrally/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/stuntrally/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -22,7 +22,8 @@ USE_CXXSTD= gnu++11 DOS2UNIX_FILES= source/ogre/BaseApp_Create.cpp CMAKE_ARGS= -DSHARE_INSTALL="${DATADIR_REL}" \ -DBULLET_ROOT="${LOCALBASE}" -LLD_UNSAFE= yes + +LDFLAGS_i386= -Wl,-znotext PORTDOCS= Readme.txt PORTDATA= * Modified: head/games/supertux2/Makefile ============================================================================== --- head/games/supertux2/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/supertux2/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -28,7 +28,7 @@ USE_SDL= sdl2 image2 ttf2 CMAKE_ARGS= -DINSTALL_SUBDIR_BIN=bin \ -DBUILD_SHARED_LIBS=off -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext DOS2UNIX_FILES= external/squirrel/CMakeLists.txt \ external/squirrel/squirrel/sqvm.cpp Modified: head/games/supertuxkart/Makefile ============================================================================== --- head/games/supertuxkart/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/supertuxkart/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -30,7 +30,6 @@ USES= alias cmake compiler:c++11-lib gettext gl \ USE_GL= gl glu glew USE_SDL= sdl USE_XORG= x11 xrandr -LLD_UNSAFE= yes CMAKE_OFF= USE_WIIUSE BUILD_RECORDER \ USE_SYSTEM_ENET USE_SYSTEM_SQUISH CMAKE_ON= USE_SYSTEM_GLEW Modified: head/games/tome4/Makefile ============================================================================== --- head/games/tome4/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/tome4/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -26,7 +26,6 @@ USE_GL= gl glu USE_CSTD= gnu89 SUB_FILES= tome4 -LLD_UNSAFE= yes MAKE_JOBS_UNSAFE= yes DESKTOP_ENTRIES="ToME 4" "" "${PORTNAME}" \ @@ -35,6 +34,7 @@ DESKTOP_ENTRIES="ToME 4" "" "${PORTNAME}" \ PLIST_SUB= PORTVERSION=${PORTVERSION} WRKSRC= ${WRKDIR}/t-engine4-src-${DISTVERSION} MAKE_ARGS+= config=release verbose=yes ARCH="" CC=${CC} CXX=${CXX} +LDFLAGS_i386= -Wl,-znotext .include <bsd.port.pre.mk> Modified: head/games/trigger-rally/Makefile ============================================================================== --- head/games/trigger-rally/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/trigger-rally/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -23,7 +23,7 @@ USE_SDL= image2 USE_GL= glu glew MAKEFILE= GNUmakefile ALL_TARGET= build -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext INSTALLS_ICONS= yes WRKSRC_SUBDIR= src Modified: head/games/ultimatestunts/Makefile ============================================================================== --- head/games/ultimatestunts/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/ultimatestunts/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -25,10 +25,6 @@ USE_SDL= sdl image GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openal MAKE_JOBS_UNSAFE= yes -# XXX Drop after FreeBSD 12.0 EOL -.if exists(/usr/lib/clang/6.0.1) -LLD_UNSAFE= yes -.endif CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_clang= -Wno-c++11-narrowing Modified: head/games/valyriatear/Makefile ============================================================================== --- head/games/valyriatear/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/valyriatear/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -31,7 +31,7 @@ USE_SDL= sdl2 image2 ttf2 USE_GL= gl glu glew USE_XORG= x11 xext sm ice INSTALLS_ICONS= yes -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * Modified: head/games/vamos/Makefile ============================================================================== --- head/games/vamos/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/games/vamos/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -29,10 +29,10 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_lib_freeglut_glutGetModifiers=no \ --disable-unit-tests USE_LDCONFIG= yes -LLD_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LDFLAGS_i386= -Wl,-znotext INFO= vamos PORTDOCS= * Modified: head/graphics/magnum-examples/Makefile ============================================================================== --- head/graphics/magnum-examples/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/graphics/magnum-examples/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -26,8 +26,7 @@ USE_SDL= sdl2 USE_XORG= ice sm x11 xext LDFLAGS+= -lGL # only missing for one example -# for openal cf. PR 226980 -LLD_UNSAFE= yes +LDFLAGS_i386= -Wl,-znotext CMAKE_ARGS= -DLIB_SUFFIX:STRING="" Modified: head/graphics/reallyslick/Makefile ============================================================================== --- head/graphics/reallyslick/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/graphics/reallyslick/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -28,7 +28,8 @@ OPTIONS_DEFINE= FREEALUT GLEW FREEALUT_DESC= Enable freealut support FREEALUT_CONFIGURE_ENABLE= sound FREEALUT_USES= openal:alut -FREEALUT_VARS= LLD_UNSAFE=yes # cf. PR 226980 +FREEALUT_LDFLAGS= ${_FREEALUT_LDFLAGS_${ARCH}} +_FREEALUT_LDFLAGS_i386= -Wl,-znotext GLEW_DESC= Enable GLEW support GLEW_USE= GL=glew Modified: head/multimedia/mpv/Makefile ============================================================================== --- head/multimedia/mpv/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/multimedia/mpv/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -104,7 +104,8 @@ MANPAGES_CONFIGURE_OFF= --disable-manpage OPENAL_CONFIGURE_ENABLE= openal OPENAL_USES= openal -OPENAL_VARS= LLD_UNSAFE=yes # cf. PR 226980 +OPENAL_LDFLAGS= ${_OPENAL_LDFLAGS_${ARCH}} +_OPENAL_LDFLAGS_i386= -Wl,-znotext OPENGL_USES= gl OPENGL_USE= GL=egl,gbm,gl Modified: head/net-im/toxic/Makefile ============================================================================== --- head/net-im/toxic/Makefile Thu Mar 19 22:41:10 2020 (r528749) +++ head/net-im/toxic/Makefile Thu Mar 19 23:02:30 2020 (r528750) @@ -41,9 +41,9 @@ PYTHON_MAKE_ARGS= ENABLE_PYTHON=1 CFLAGS+= -I${NCURSESINC} LDFLAGS+= -L${NCURSESLIB} +LDFLAGS_i386= -Wl,-znotext MAKE_ENV= USER_CFLAGS="${CFLAGS}" USER_LDFLAGS="${LDFLAGS}" \ MANDIR="${MANPREFIX}/man" -LLD_UNSAFE= yes SUB_FILES= pkg-message post-patch-PYTHON-on:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003192302.02JN2ViL053774>