On Wed 15 Apr 2015 at 00:50:30 +0200, Thomas Klausner wrote:
> Probably an rpath issue. Try getting '-Wl,-R${X11BASE}/lib' add to the
> linker command line.
I completely forgot that I had fixed this issue before when py-qt5 was
still in pkgsrc/wip. Fortunately I kept my changed version.
Here is a diff plus 2 new patch files (distinfo patch omitted):
? patches/patch-designer_designer.pro-in
? patches/patch-qmlscene_qmlscene.pro-in
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt5/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 6 Apr 2015 08:17:40 -0000 1.3
+++ Makefile 15 Apr 2015 19:40:51 -0000
@@ -28,7 +28,7 @@
PY_PATCHPLIST= yes
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-SUBST_CLASSES+= install
+SUBST_CLASSES+= install x11lib
SUBST_STAGE.install= post-configure
SUBST_SED.install+= -e 's,INSTALL_FILE = ,INSTALL_FILE = libtool --mode=install ,'
SUBST_SED.install+= -e 's,\(TARGET[A-Z ]*\)= lib,\1= ,'
@@ -57,6 +57,13 @@
SUBST_FILES.install+= QtXmlPatterns/Makefile
SUBST_FILES.install+= _QOpenGLFunctions_2_0/Makefile
+SUBST_STAGE.x11lib= post-patch
+SUBST_SED.x11lib+= -e 's,@X11LIB@,${X11BASE}/lib,'
+SUBST_MESSAGE.x11lib= Fixing rpath for X11 libraries.
+SUBST_FILES.x11lib+= configure.py
+SUBST_FILES.x11lib+= designer/designer.pro-in
+SUBST_FILES.x11lib+= qmlscene/qmlscene.pro-in
+
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${PYTHONBIN} configure.py ${CONFIGURE_ARGS}
Index: patches/patch-configure.py
===================================================================
RCS file: /cvsroot/pkgsrc/x11/py-qt5/patches/patch-configure.py,v
retrieving revision 1.2
diff -u -r1.2 patch-configure.py
--- patches/patch-configure.py 12 Apr 2015 17:55:46 -0000 1.2
+++ patches/patch-configure.py 15 Apr 2015 19:40:51 -0000
@@ -17,7 +17,7 @@
remove_file(platform_exe)
-@@ -2363,8 +2360,8 @@ win32 {
+@@ -2363,8 +2360,9 @@ win32 {
target.files = %s%s.pyd
LIBS += %s
} else {
@@ -25,6 +25,7 @@
- target.files = %s.so
+ PY_MODULE = %s.la
+ target.files = %s.la
++ LIBS += -Wl,-rpath,@X11LIB@
}
''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name)
patches/patch-designer_designer.pro-in:
$NetBSD$
--- designer/designer.pro-in.orig 2014-12-25 10:18:22.000000000 +0000
+++ designer/designer.pro-in
@@ -9,6 +9,7 @@ TEMPLATE = lib
INCLUDEPATH += @PYINCDIR@
LIBS += @PYLINK@
+LIBS += -Wl,-rpath,@X11LIB@
DEFINES += PYTHON_LIB=\\\"@PYSHLIB@\\\"
SOURCES = pluginloader.cpp
patches/patch-qmlscene_qmlscene.pro-in:
$NetBSD$
--- qmlscene/qmlscene.pro-in.orig 2014-12-25 10:18:22.000000000 +0000
+++ qmlscene/qmlscene.pro-in
@@ -9,6 +9,7 @@ TEMPLATE = lib
INCLUDEPATH += @PYINCDIR@ @SIPINCDIR@
LIBS += @PYLINK@
+LIBS += -Wl,-rpath,@X11LIB@
SOURCES = pluginloader.cpp
HEADERS = pluginloader.h
-Olaf.
--
___ Olaf 'Rhialto' Seibert -- The Doctor: No, 'eureka' is Greek for
\X/ rhialto/at/xs4all.nl -- 'this bath is too hot.'
Attachment:
pgp6n_RqDDVbo.pgp
Description: PGP signature