Tue Jun 30 15:33:06 2009 UTC ()
Hack around the -fPIC compilation problem on amd64 by sed(1)ing
-fPIC in the necessary Makefiles.


(wiz)
diff -r1.9 -r1.10 pkgsrc/x11/py-qt4/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/x11/py-qt4/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-qt4/Attic/Makefile 2009/06/17 07:57:49 1.9
+++ pkgsrc/x11/py-qt4/Attic/Makefile 2009/06/30 15:33:06 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2009/06/17 07:57:49 hasso Exp $ 1# $NetBSD: Makefile,v 1.10 2009/06/30 15:33:06 wiz Exp $
2# 2#
3 3
4PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} 4PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
5PYQT_VERSION= 4.5.1 5PYQT_VERSION= 4.5.1
6CATEGORIES= x11 python 6CATEGORIES= x11 python
7MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt4/ 7MASTER_SITES= http://www.riverbankcomputing.com/static/Downloads/PyQt4/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Python binding for Qt4 10COMMENT= Python binding for Qt4
11HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro 11HOMEPAGE= http://www.riverbankcomputing.com/software/pyqt/intro
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
@@ -18,26 +18,34 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -18,26 +18,34 @@ PKG_DESTDIR_SUPPORT= user-destdir
18 18
19CONFIGURE_ARGS+= -b ${PREFIX}/bin 19CONFIGURE_ARGS+= -b ${PREFIX}/bin
20CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB} 20CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
21CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} 21CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
22CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake 22CONFIGURE_ARGS+= -q ${QTDIR}/bin/qmake
23CONFIGURE_ARGS+= --confirm-license 23CONFIGURE_ARGS+= --confirm-license
24 24
25INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q} 25INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}
26 26
27PYTHON_VERSIONS_ACCEPTED= 26 25 24 27PYTHON_VERSIONS_ACCEPTED= 26 25 24
28PY_PATCHPLIST= yes 28PY_PATCHPLIST= yes
29PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} 29PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
30 30
 31# This is a hack. CPPFLAGS and CXXFLAGS from the environment are ignored,
 32# however, so I don't know a better way to fix it.
 33SUBST_CLASSES+= PIC
 34SUBST_STAGE.PIC= post-configure
 35SUBST_FILES.PIC= qpy/QtCore/Makefile qpy/QtGui/Makefile
 36SUBST_SED.PIC= -e "s/CXXFLAGS =/CXXFLAGS = -fPIC/"
 37SUBST_MESSAGE.PIC= Adding -fPIC to CXXFLAGS.
 38
31#SUBST_CLASSES+= pyversfx 39#SUBST_CLASSES+= pyversfx
32#SUBST_STAGE.pyversfx= pre-configure 40#SUBST_STAGE.pyversfx= pre-configure
33#SUBST_FILES.pyversfx= pyuic4/pyuic.sbf pylupdate4/pylupdate.sbf 41#SUBST_FILES.pyversfx= pyuic4/pyuic.sbf pylupdate4/pylupdate.sbf
34#SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g" 42#SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
35 43
36.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
37 45
38PLIST_SRC= ${PKGDIR}/PLIST.common 46PLIST_SRC= ${PKGDIR}/PLIST.common
39.if ${OPSYS} == "Darwin" 47.if ${OPSYS} == "Darwin"
40DISTNAME= PyQt-mac-gpl-${PYQT_VERSION} 48DISTNAME= PyQt-mac-gpl-${PYQT_VERSION}
41PLIST_SRC+= ${PKGDIR}/PLIST.Darwin 49PLIST_SRC+= ${PKGDIR}/PLIST.Darwin
42.else 50.else
43DISTNAME= PyQt-x11-gpl-${PYQT_VERSION} 51DISTNAME= PyQt-x11-gpl-${PYQT_VERSION}