Thu Jul 21 17:07:11 2011 UTC ()
Don't enumerate evil. Pass down -L* and -l* only from LDFLAGS.


(joerg)
diff -r1.73 -r1.74 pkgsrc/x11/qt3-libs/Makefile.common
diff -r1.26 -r1.27 pkgsrc/x11/qt4-libs/Makefile.common
cvs diff -r1.73 -r1.74 pkgsrc/x11/qt3-libs/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt3-libs/Attic/Makefile.common 2011/03/06 16:10:22 1.73
+++ pkgsrc/x11/qt3-libs/Attic/Makefile.common 2011/07/21 17:07:11 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.73 2011/03/06 16:10:22 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.74 2011/07/21 17:07:11 joerg Exp $
2# used by x11/qt3-docs/Makefile 2# used by x11/qt3-docs/Makefile
3# used by x11/qt3-libs/Makefile 3# used by x11/qt3-libs/Makefile
4# used by x11/qt3-tools/Makefile 4# used by x11/qt3-tools/Makefile
5 5
6DISTNAME= qt-x11-free-${QTVERSION} 6DISTNAME= qt-x11-free-${QTVERSION}
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ 8MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
9 ftp://ftp.bero.org/pub/qt/source/ \ 9 ftp://ftp.bero.org/pub/qt/source/ \
10 http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/ 10 http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13.include "../../x11/qt3/Makefile.common" 13.include "../../x11/qt3/Makefile.common"
14 14
@@ -17,27 +17,27 @@ FILESDIR= ${.CURDIR}/../../x11/qt3-libs @@ -17,27 +17,27 @@ FILESDIR= ${.CURDIR}/../../x11/qt3-libs
17PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches 17PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches
18 18
19HAS_CONFIGURE= yes 19HAS_CONFIGURE= yes
20USE_TOOLS+= gmake 20USE_TOOLS+= gmake
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23 23
24QTPREFIX= ${PREFIX}/qt3 24QTPREFIX= ${PREFIX}/qt3
25 25
26CONFIGURE_ARGS+= -prefix ${QTPREFIX} 26CONFIGURE_ARGS+= -prefix ${QTPREFIX}
27CONFIGURE_ARGS+= -shared -sm -thread \ 27CONFIGURE_ARGS+= -shared -sm -thread \
28 -system-zlib -system-libpng \ 28 -system-zlib -system-libpng \
29 -system-libmng -system-libjpeg \ 29 -system-libmng -system-libjpeg \
30 ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//:S/-dylib_file//:C/.*\.dylib\:.*\.dylib//} 30 ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
31CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs 31CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs
32 32
33CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance 33CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
34 34
35LIBQT?= -lqt-mt 35LIBQT?= -lqt-mt
36 36
37MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 37MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
38MAKE_ENV+= QTDIR=${WRKSRC:Q} 38MAKE_ENV+= QTDIR=${WRKSRC:Q}
39 39
40# avoid creating a .qt directory in the users home 40# avoid creating a .qt directory in the users home
41# directory 41# directory
42SCRIPTS_ENV+= HOME="${WRKDIR}" 42SCRIPTS_ENV+= HOME="${WRKDIR}"
43 43
cvs diff -r1.26 -r1.27 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2011/05/16 22:13:46 1.26
+++ pkgsrc/x11/qt4-libs/Makefile.common 2011/07/21 17:07:11 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.26 2011/05/16 22:13:46 cheusov Exp $ 1# $NetBSD: Makefile.common,v 1.27 2011/07/21 17:07:11 joerg Exp $
2# used by x11/qt4-docs/Makefile 2# used by x11/qt4-docs/Makefile
3# used by x11/qt4-libs/Makefile 3# used by x11/qt4-libs/Makefile
4# used by x11/qt4-mng/Makefile 4# used by x11/qt4-mng/Makefile
5# used by x11/qt4-mysql/Makefile 5# used by x11/qt4-mysql/Makefile
6# used by x11/qt4-pgsql/Makefile 6# used by x11/qt4-pgsql/Makefile
7# used by x11/qt4-qdbus/Makefile 7# used by x11/qt4-qdbus/Makefile
8# used by x11/qt4-sqlite3/Makefile 8# used by x11/qt4-sqlite3/Makefile
9# used by x11/qt4-tiff/Makefile 9# used by x11/qt4-tiff/Makefile
10 10
11DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 11DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/ 13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/
14#EXTRACT_SUFX= .tar.bz2 14#EXTRACT_SUFX= .tar.bz2
@@ -27,28 +27,27 @@ USE_TOOLS+= gmake @@ -27,28 +27,27 @@ USE_TOOLS+= gmake
27.if empty(PKGNAME:U:Mqt4-libs-*) 27.if empty(PKGNAME:U:Mqt4-libs-*)
28BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION} 28BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION}
29.endif 29.endif
30 30
31QTPREFIX= ${PREFIX}/qt4 31QTPREFIX= ${PREFIX}/qt4
32 32
33# libphonon is available in multimedia/phonon 33# libphonon is available in multimedia/phonon
34CONFIGURE_ARGS+= -no-phonon 34CONFIGURE_ARGS+= -no-phonon
35CONFIGURE_ARGS+= -no-phonon-backend 35CONFIGURE_ARGS+= -no-phonon-backend
36CONFIGURE_ARGS+= -optimized-qmake 36CONFIGURE_ARGS+= -optimized-qmake
37CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 37CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
38CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs 38CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
39CONFIGURE_ARGS.SunOS+= -no-xrender 39CONFIGURE_ARGS.SunOS+= -no-xrender
40CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} 40CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
41CONFIGURE_ARGS+= ${LDFLAGS:M-Wl*:S/-Wl,//:S/-syslibroot,/-sdk /} 
42CONFIGURE_ARGS+= -opensource -confirm-license 41CONFIGURE_ARGS+= -opensource -confirm-license
43OPSYSVARS+= CONFIGURE_ARGS 42OPSYSVARS+= CONFIGURE_ARGS
44 43
45.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
46 45
47.if !empty(MAKE_JOBS) 46.if !empty(MAKE_JOBS)
48CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} 47CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
49.endif 48.endif
50 49
51LIBQT?= -lQtCore -lQtGui 50LIBQT?= -lQtCore -lQtGui
52 51
53MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 52MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
54MAKE_ENV+= QTDIR=${WRKSRC} 53MAKE_ENV+= QTDIR=${WRKSRC}