Fri Oct 23 15:47:09 2009 UTC ()
Fix qt4-tools build on Linux by adding -ldl to LDFLAGS.
>From Ondrej Tuma in PR pkg/37688
XXX I think -ldl should go into the generated libQtCore.la instead,
but I lack sufficient clue how to make that happen.


(tnn)
diff -r1.16 -r1.17 pkgsrc/x11/qt4-libs/Makefile.common
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2009/10/11 09:14:52 1.16
+++ pkgsrc/x11/qt4-libs/Makefile.common 2009/10/23 15:47:09 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.16 2009/10/11 09:14:52 adam Exp $ 1# $NetBSD: Makefile.common,v 1.17 2009/10/23 15:47:09 tnn Exp $
2# used by x11/qt4-libs/Makefile 2# used by x11/qt4-libs/Makefile
3# used by x11/qt4-docs/Makefile 3# used by x11/qt4-docs/Makefile
4 4
5DISTNAME= qt-x11-opensource-src-${QTVERSION} 5DISTNAME= qt-x11-opensource-src-${QTVERSION}
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ 7MASTER_SITES= http://get.qtsoftware.com/qt/source/ \
8 ftp://ftp.qtsoftware.com/qt/source/ 8 ftp://ftp.qtsoftware.com/qt/source/
9#EXTRACT_SUFX= .tar.bz2 9#EXTRACT_SUFX= .tar.bz2
10 10
11.include "../../x11/qt4/Makefile.common" 11.include "../../x11/qt4/Makefile.common"
12 12
13DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
14FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 14FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
@@ -69,26 +69,28 @@ SYS_LIBS= -lresolv -lsocket -lnsl -lrt @@ -69,26 +69,28 @@ SYS_LIBS= -lresolv -lsocket -lnsl -lrt
69.elif ${OPSYS} == "Interix" 69.elif ${OPSYS} == "Interix"
70CONFIGURE_ARGS+= -platform interix-g++ 70CONFIGURE_ARGS+= -platform interix-g++
71CFLAGS+= -I/usr/local/include/bind 71CFLAGS+= -I/usr/local/include/bind
72LDFLAGS+= -L/usr/local/lib/bind -lbind 72LDFLAGS+= -L/usr/local/lib/bind -lbind
73BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 73BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
74SYS_LIBS= -lbind -ldb -ldl 74SYS_LIBS= -lbind -ldb -ldl
75.elif ${OPSYS} == "DragonFly" 75.elif ${OPSYS} == "DragonFly"
76CONFIGURE_ARGS+= -platform freebsd-g++ 76CONFIGURE_ARGS+= -platform freebsd-g++
77.elif ${OPSYS} == "Darwin" 77.elif ${OPSYS} == "Darwin"
78QMAKE_RANLIB= ${RANLIB} 78QMAKE_RANLIB= ${RANLIB}
79. if exists(/usr/lib/libresolv.dylib) 79. if exists(/usr/lib/libresolv.dylib)
80LDFLAGS+= -lresolv 80LDFLAGS+= -lresolv
81. endif 81. endif
 82.elif ${OPSYS} == "Linux"
 83LDFLAGS+= -ldl
82.endif 84.endif
83 85
84QMAKE_RANLIB?= ${TRUE} 86QMAKE_RANLIB?= ${TRUE}
85 87
86.if ${X11_TYPE} != "native" 88.if ${X11_TYPE} != "native"
87.include "../../x11/libXinerama/buildlink3.mk" 89.include "../../x11/libXinerama/buildlink3.mk"
88.elif !exists(${X11BASE}/lib/libXinerama.so) && \ 90.elif !exists(${X11BASE}/lib/libXinerama.so) && \
89 !exists(${X11BASE}/lib/libXinerama.dylib) 91 !exists(${X11BASE}/lib/libXinerama.dylib)
90CONFIGURE_ARGS+= -no-xinerama 92CONFIGURE_ARGS+= -no-xinerama
91.endif 93.endif
92 94
93.include "options.mk" 95.include "options.mk"
94 96