Date: Sat, 1 Mar 2014 10:13:26 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346610 - in head/games/gtkradiant: . files Message-ID: <201403011013.s21ADQq0001528@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Mar 1 10:13:26 2014 New Revision: 346610 URL: http://svnweb.freebsd.org/changeset/ports/346610 QAT: https://qat.redports.org/buildarchive/r346610/ Log: Unbreak the build on recent -CURRENT, where linker is more strict. Reported by: pkg-fallout Added: head/games/gtkradiant/files/patch-SConscript (contents, props changed) Modified: head/games/gtkradiant/Makefile Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Sat Mar 1 10:06:45 2014 (r346609) +++ head/games/gtkradiant/Makefile Sat Mar 1 10:13:26 2014 (r346610) @@ -34,7 +34,6 @@ WRKSRC= ${WRKDIR}/GPL/GtkRadiant SUB_FILES= ${PORTNAME} post-patch: - @${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript @${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \ ${XARGS} ${REINPLACE_CMD} -e \ 's/\(defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)\)/\1 || defined (__FreeBSD__)/' Added: head/games/gtkradiant/files/patch-SConscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/gtkradiant/files/patch-SConscript Sat Mar 1 10:13:26 2014 (r346610) @@ -0,0 +1,20 @@ +--- SConscript.orig 2006-02-11 06:01:20.000000000 +0800 ++++ SConscript +@@ -359,8 +359,6 @@ module_env = g_env.Copy() + module_env['CPPPATH'].append('include') + if ( OS == 'Darwin' ): + module_env['LINKFLAGS'] += '-dynamiclib -ldl ' +-else: +- module_env['LINKFLAGS'] += '-ldl ' + module_env['LIBPREFIX'] = '' + + +@@ -485,7 +483,7 @@ module_env.Install(INSTALL + '/modules', + + radiant_env = g_env.Copy() + radiant_env['CPPPATH'].append('include') +-radiant_env['LINKFLAGS'] += '-ldl -lGL ' ++radiant_env['LINKFLAGS'] += '-lX11 -lGL ' + if ( OS == 'Darwin' ): + radiant_env['CXXFLAGS'] += '-fno-common ' + radiant_env['CCFLAGS'] += '-fno-common '
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403011013.s21ADQq0001528>