pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/50876: x11/py-qt5 needs rpath for X11BASE [with patch]



The following reply was made to PR pkg/50876; it has been noted by GNATS.

From: Rhialto <rhialto%falu.nl@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/50876: x11/py-qt5 needs rpath for X11BASE [with patch]
Date: Sun, 17 Apr 2016 18:24:57 +0200

 When rebuilding for the current quarterly snapshot, I got these errors:
 
     => Checking file-check results for py27-qt5-5.5.1nb2                        
     => Checking for non-existent script interpreters in py27-qt5-5.5.1nb2
     => Checking file permissions in py27-qt5-5.5.1nb2                     
     => Checking for missing run-time search paths in py27-qt5-5.5.1nb2
     ERROR: lib/python2.7/site-packages/PyQt5/QtMultimedia.so: missing library: l
 ibpulsecommon-6.0.so                                                            
     ERROR: lib/python2.7/site-packages/PyQt5/QtMultimediaWidgets.so: missing lib
 rary: libpulsecommon-6.0.so                                                     
     *** Error code 1                                                            
 
 I amended my previous patch of the configure script to add another
 search directory, with a corresponding extra SUBST command in the
 Makefile:
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/x11/py-qt5/Makefile,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile
 --- Makefile	5 Mar 2016 11:29:47 -0000	1.9
 +++ Makefile	17 Apr 2016 16:22:32 -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,14 @@
  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_SED.x11lib+=      -e 's,@PREFIX@,${PREFIX},'
 +SUBST_MESSAGE.x11lib=   Fixing rpath for X11 and pulseaudio 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}
 
 $NetBSD: patch-configure.py,v 1.3 2015/10/26 21:40:40 adam Exp $
 
 On Darwin, do not expect application bundle.
 Adapt for pkgsrc change to make qmake create libtool files.
 
 --- configure.py.orig	2015-10-25 11:42:16.000000000 +0000
 +++ configure.py
 @@ -1932,10 +1932,7 @@ def run_make(target_config, verbose, exe
          make = 'make'
          makefile_target = ''
  
 -        if target_config.py_platform == 'darwin':
 -            platform_exe = os.path.join(exe + '.app', 'Contents', 'MacOS', exe)
 -        else:
 -            platform_exe = os.path.join('.', exe)
 +        platform_exe = os.path.join('.', exe)
  
      remove_file(platform_exe)
  
 @@ -2441,8 +2438,10 @@ win32 {
      target.files = %s%s.pyd
      LIBS += %s
  } else {
 -    PY_MODULE = %s.so
 -    target.files = %s.so
 +    PY_MODULE = %s.la
 +    target.files = %s.la
 +    LIBS += -Wl,-rpath,@X11LIB@
 +    LIBS += -Wl,-rpath,@PREFIX@/lib/pulseaudio
  }
  ''' % (target_name, debug_suffix, target_name, debug_suffix, link, target_name, target_name)
  
 @@ -2517,9 +2514,6 @@ win32 {
              # common case where the PyQt configuration reflects the Qt
              # configuration.
              fwks = []
 -            for m in ('QtPrintSupport', 'QtDBus', 'QtWidgets'):
 -                if m in target_config.pyqt_modules:
 -                    fwks.append('-framework ' + m)
  
              if len(fwks) != 0:
                  extra_lflags = 'QMAKE_LFLAGS += "%s"\n        ' % ' '.join(fwks)
 @@ -2532,7 +2526,6 @@ win32 {
  }
  macx {
      QMAKE_LFLAGS += "-undefined dynamic_lookup"
 -    QMAKE_LFLAGS += "-install_name $$absolute_path($$PY_MODULE, $$target.path)"
  
      greaterThan(QT_MINOR_VERSION, 4) {
          %sQMAKE_RPATHDIR += $$[QT_INSTALL_LIBS]
 
 -Olaf.
 -- 
 ___ Olaf 'Rhialto' Seibert  -- The Doctor: No, 'eureka' is Greek for
 \X/ rhialto/at/xs4all.nl    -- 'this bath is too hot.'
 


Home | Main Index | Thread Index | Old Index