diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-09-06 07:05:28 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2013-09-06 07:05:28 +0000 |
| commit | 472be471548ab3788eb5ac86728fb6fd6d9ba8be (patch) | |
| tree | a8a1d0bf27d8c60fa3b94c2c703a19902391e0eb /games/gtkradiant | |
| parent | 98ce82f4f59730bae4b4a09ec1968909b8f38004 (diff) | |
| download | ports-472be471548ab3788eb5ac86728fb6fd6d9ba8be.tar.gz ports-472be471548ab3788eb5ac86728fb6fd6d9ba8be.zip | |
- 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)
Notes
Notes:
svn path=/head/; revision=326470
Diffstat (limited to 'games/gtkradiant')
| -rw-r--r-- | games/gtkradiant/Makefile | 2 | ||||
| -rw-r--r-- | games/gtkradiant/files/patch-SConstruct | 22 |
2 files changed, 16 insertions, 8 deletions
diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile index 82bc450d0097..55882cbf630e 100644 --- a/games/gtkradiant/Makefile +++ b/games/gtkradiant/Makefile @@ -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} diff --git a/games/gtkradiant/files/patch-SConstruct b/games/gtkradiant/files/patch-SConstruct index fa6ddeb1ac66..c85919527dcc 100644 --- a/games/gtkradiant/files/patch-SConstruct +++ b/games/gtkradiant/files/patch-SConstruct @@ -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 |