summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-04-27 11:39:15 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-04-27 11:39:15 +0000
commit57e4f10e06f014452cb30a0395e71be4c74d3ff7 (patch)
treeb2257f6bcdbc8162da95b3f9ad8ccc567e3c0a29 /x11-toolkits
parentUpdate to 1.5.1 (diff)
Use correct -soname for qtgl shared library, so that libqtgl actually works.
Previously libqtgl.so.4 was libked with soname of libqt2.so.4, so that when you link application with -lqtgl you are fine, but when you are trying to run resulting application it dies because libqt2 (which has no GL code) is dynamically linked instead. Not objected by: will
Notes
Notes: svn path=/head/; revision=58224
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/qt23/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index c42d48923dad..3f2e378c6d13 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -7,7 +7,7 @@
PORTNAME?= qt
PORTVERSION?= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.chg.ru/pub/X11/qt/source/
@@ -126,7 +126,8 @@ do-build:
(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o)
${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4
${PERL} -pi.orig -e "s@ xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \
- s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= ${PTHREAD_LIBS} -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile
+ s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= ${PTHREAD_LIBS} -lGL -lGLU -lXmu@g ; \
+ s@soname,lib[\\$$]\(TARGET\)\.so\.[\\$$]\(VER_MAJ\)@soname,libqtgl.so.4@g" ${WRKSRC}/src/Makefile
(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4
${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4