Date: Fri, 6 Sep 2013 07:05:29 +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: r326470 - in head/games/gtkradiant: . files Message-ID: <201309060705.r8675TIb068470@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Sep 6 07:05:28 2013 New Revision: 326470 URL: http://svnweb.freebsd.org/changeset/ports/326470 Log: - Unbreak linking with our new ld(1) by explicitly listing -lgobject-2.0 on the LINKFLAGS, otherwise we get this: /usr/bin/ld: invalid DSO for symbol `g_signal_connect_data' definition /usr/local/lib/libgobject-2.0.so.0: could not read symbols: Bad value c++: error: linker command failed with exit code 1 (...) scons: *** [build/release/radiant.cpu] Error 1 - Replace PTHREAD_LIBS variable with '-pthread' and tidy up some superfluous LOCALBASE-related assignments while here (leftovers from X11BASE era) Modified: head/games/gtkradiant/Makefile head/games/gtkradiant/files/patch-SConstruct Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Fri Sep 6 07:04:56 2013 (r326469) +++ head/games/gtkradiant/Makefile Fri Sep 6 07:05:28 2013 (r326470) @@ -27,7 +27,7 @@ USE_ZIP= yes USE_GNOME= gtk20 libxml2 USE_PYTHON_BUILD= yes USE_SCONS= yes -SCONS_ARGS= ${MAKE_ENV} BUILD=release PTHREAD_LIBS="${PTHREAD_LIBS}" +SCONS_ARGS= ${MAKE_ENV} BUILD=release SUB_FILES= ${PORTNAME} DATADIR= ${PREFIX}/lib/${PORTNAME} Modified: head/games/gtkradiant/files/patch-SConstruct ============================================================================== --- head/games/gtkradiant/files/patch-SConstruct Fri Sep 6 07:04:56 2013 (r326469) +++ head/games/gtkradiant/files/patch-SConstruct Fri Sep 6 07:05:28 2013 (r326470) @@ -13,7 +13,7 @@ # there is a default hardcoded value, you can override on command line, those are saved between runs # we only handle strings -serialized=['CC', 'CXX', 'JOBS', 'BUILD', 'SETUP'] -+serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'PTHREAD_LIBS', 'LOCALBASE', 'LOCALBASE', 'JOBS', 'BUILD', 'SETUP'] ++serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'LOCALBASE', 'JOBS', 'BUILD', 'SETUP'] # help ------------------------------------------- @@ -52,7 +52,7 @@ if ( OS == 'Linux' ): # static -@@ -218,6 +209,12 @@ +@@ -218,6 +209,11 @@ CPPPATH.append('/sw/include') CPPPATH.append('/usr/X11R6/include') LINKFLAGS += '-L/sw/lib -L/usr/lib -L/usr/X11R6/lib ' @@ -60,21 +60,29 @@ + CCFLAGS += '-fPIC ' + CXXFLAGS += '-fPIC ' + CPPPATH.append(LOCALBASE + '/include') -+ CPPPATH.append(LOCALBASE + '/include') -+ LINKFLAGS += '-L' + LOCALBASE + '/lib ' + '-L' + LOCALBASE + '/lib ' ++ LINKFLAGS += '-L' + LOCALBASE + '/lib ' CPPPATH.append('libs') -@@ -269,6 +266,8 @@ +@@ -248,7 +244,7 @@ + def useGtk2(self): + self['CXXFLAGS'] += '`pkg-config gtk+-2.0 --cflags` ' + self['CCFLAGS'] += '`pkg-config gtk+-2.0 --cflags` ' +- self['LINKFLAGS'] += '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpango-1.0 -lgdk_pixbuf-2.0 ' ++ self['LINKFLAGS'] += '-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpango-1.0 -lgdk_pixbuf-2.0 -lgobject-2.0 ' + + def useGtkGLExt(self): + self['CXXFLAGS'] += '`pkg-config gtkglext-1.0 --cflags` ' +@@ -269,6 +265,8 @@ def usePThread(self): if ( OS == 'Darwin' ): self['LINKFLAGS'] += '-lpthread -Wl,-stack_size,0x400000 ' + elif ( OS == 'FreeBSD' ): -+ self['LINKFLAGS'] += PTHREAD_LIBS ++ self['LINKFLAGS'] += '-pthread ' else: self['LINKFLAGS'] += '-lpthread ' -@@ -278,7 +277,7 @@ +@@ -278,7 +276,7 @@ print('ERROR: CheckLDD: target %s not found\n' % target[0]) Exit(1) # not using os.popen3 as I want to check the return code
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309060705.r8675TIb068470>