we need to use -rpath, not -rpath-link on x86 or else the inputmethods don't

find their stuff (e.g. libpickboard.so) in <whereYourOpieDirIs>/plugins/inputmethods/

1 files changed, 3 insertions, 3 deletions

diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index bccb196..add69b3 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -1,76 +1,76 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
         CONFIG          += qt warn_on release
 
         QMAKE_CC        = $(CCACHE) $(DISTCC) gcc
         QMAKE_LEX       = flex
         QMAKE_LEXFLAGS  =
         QMAKE_YACC      = yacc
         QMAKE_YACCFLAGS         = -d
         QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
         QMAKE_CFLAGS_WARN_ON= -Wall -W
         QMAKE_CFLAGS_WARN_OFF=
         QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
         QMAKE_CFLAGS_DEBUG= -g
         QMAKE_CFLAGS_SHLIB= -fPIC
         QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
         QMAKE_CFLAGS_THREAD= -D_REENTRANT
 
         QMAKE_CXX       = $(CCACHE) $(DISTCC) g++
         QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
         QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
         QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
         QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
         QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_X11= 
         QMAKE_LIBDIR_X11= 
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
 
-        QMAKE_LINK      = g++
-        QMAKE_LINK_SHLIB= g++
+        QMAKE_LINK      = gcc
+        QMAKE_LINK_SHLIB= gcc
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
-QMAKE_RPATH             = -Wl,-rpath-link,
+QMAKE_RPATH             = -Wl,-rpath,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
         QMAKE_LIBS_X11  = 
         QMAKE_LIBS_X11SM= 
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cqs
         QMAKE_RANLIB    =
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir