mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-22 08:58:47 +00:00
During regression testing the WIP Qt 4.3.0 ports, I found that the sql
driver plugins were all broken - even in the current ports! :( I am quite astonished nobody complained about this yet. Is there nobody developing applications with database backends using Qt4 on FreeBSD? The ports let you use the QtSql library and the database plugins without any X11 dependencies! Using Qt for database frontends has never been so attractive! Anyway, this should fix the plugins.
This commit is contained in:
parent
0c0668d340
commit
ee279d859f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=195506
@ -8,6 +8,7 @@
|
||||
|
||||
PORTNAME= qt4-${DB}-plugin
|
||||
PORTVERSION= 4.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_QT}
|
||||
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
|
||||
@ -23,11 +24,14 @@ LIB_DEPENDS+= gds:${PORTSDIR}/databases/firebird-client \
|
||||
|
||||
#USE_BZIP2= yes
|
||||
DRIVER= src/sql/drivers/${DB}
|
||||
PLUGIN= src/plugins/sqldrivers/${DB}
|
||||
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/include/QtSql \
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
|
||||
${DISTNAME}/include/QtSql \
|
||||
${DISTNAME}/src/sql/kernel
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
|
||||
PLUGIN="${PLUGIN}" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
PLIST_SUB= DB=${DB}
|
||||
|
@ -1,18 +1,24 @@
|
||||
SHLIB_NAME= libqsql${DB}.so
|
||||
|
||||
VPATH= ${DRIVER}
|
||||
VPATH= ${PLUGIN}:${DRIVER}
|
||||
CXXFLAGS+= -I${DRIVER} -Iinclude \
|
||||
-I${LOCALBASE}/include/Qt \
|
||||
-I${LOCALBASE}/include \
|
||||
${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
|
||||
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
|
||||
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
|
||||
-D_LARGEFILE_SOURCE -DQT_SHARED
|
||||
MOC?= ${LOCALBASE}/bin/moc-qt4
|
||||
LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds
|
||||
SRCS= qsql_${DB}.cpp
|
||||
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/plugins/sqldrivers
|
||||
|
||||
${LIBDIR}:
|
||||
mkdir -p ${LIBDIR}
|
||||
|
||||
moc_qsql_${DB}.cpp: qsql_${DB}.h
|
||||
$(MOC) $(.ALLSRC) -o $(.TARGET)
|
||||
|
||||
beforeinstall: ${LIBDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
PORTNAME= qt4-${DB}-plugin
|
||||
PORTVERSION= 4.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_QT}
|
||||
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
|
||||
@ -23,10 +24,12 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql
|
||||
USE_MYSQL= yes
|
||||
#USE_BZIP2= yes
|
||||
DRIVER= src/sql/drivers/${DB}
|
||||
PLUGIN= src/plugins/sqldrivers/${DB}
|
||||
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
|
||||
${DISTNAME}/${DRIVER}
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
|
||||
PLUGIN="${PLUGIN}" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
PLIST_SUB= DB=${DB}
|
||||
|
@ -1,19 +1,24 @@
|
||||
SHLIB_NAME= libqsql${DB}.so
|
||||
|
||||
VPATH= ${DRIVER}
|
||||
VPATH= ${PLUGIN}:${DRIVER}
|
||||
CXXFLAGS+= -I${DRIVER} \
|
||||
-I${LOCALBASE}/include/Qt \
|
||||
-I${LOCALBASE}/include/mysql \
|
||||
-I${LOCALBASE}/include \
|
||||
${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
|
||||
LDADD= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient
|
||||
SRCS= qsql_${DB}.cpp
|
||||
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \
|
||||
-DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED
|
||||
LDADD= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmysqlclient_r
|
||||
MOC?= ${LOCALBASE}/bin/moc-qt4
|
||||
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/plugins/sqldrivers
|
||||
|
||||
${LIBDIR}:
|
||||
mkdir -p ${LIBDIR}
|
||||
|
||||
moc_qsql_${DB}.cpp: qsql_${DB}.h
|
||||
$(MOC) $(.ALLSRC) -o $(.TARGET)
|
||||
|
||||
beforeinstall: ${LIBDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
PORTNAME= qt4-${DB}-plugin
|
||||
PORTVERSION= 4.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_QT}
|
||||
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
|
||||
@ -23,10 +24,12 @@ LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC \
|
||||
|
||||
#USE_BZIP2= yes
|
||||
DRIVER= src/sql/drivers/${DB}
|
||||
PLUGIN= src/plugins/sqldrivers/${DB}
|
||||
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
|
||||
${DISTNAME}/${DRIVER}
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
|
||||
PLUGIN="${PLUGIN}" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
PLIST_SUB= DB=${DB}
|
||||
|
@ -1,18 +1,24 @@
|
||||
SHLIB_NAME= libqsql${DB}.so
|
||||
|
||||
VPATH= ${DRIVER}
|
||||
VPATH= ${PLUGIN}:${DRIVER}
|
||||
CXXFLAGS+= -I${DRIVER} \
|
||||
-I${LOCALBASE}/include/Qt \
|
||||
-I${LOCALBASE}/include \
|
||||
${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
|
||||
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
|
||||
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
|
||||
-D_LARGEFILE_SOURCE -DQT_SHARED
|
||||
LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc
|
||||
SRCS= qsql_${DB}.cpp
|
||||
MOC?= ${LOCALBASE}/bin/moc-qt4
|
||||
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/plugins/sqldrivers
|
||||
|
||||
${LIBDIR}:
|
||||
mkdir -p ${LIBDIR}
|
||||
|
||||
moc_qsql_${DB}.cpp: qsql_${DB}.h
|
||||
$(MOC) $(.ALLSRC) -o $(.TARGET)
|
||||
|
||||
beforeinstall: ${LIBDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
PORTNAME= qt4-${DB}-plugin
|
||||
PORTVERSION= 4.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_QT}
|
||||
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
|
||||
@ -23,10 +24,12 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql
|
||||
USE_PGSQL= yes
|
||||
#USE_BZIP2= yes
|
||||
DRIVER= src/sql/drivers/${DB}
|
||||
PLUGIN= src/plugins/sqldrivers/${DB}
|
||||
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
|
||||
${DISTNAME}/${DRIVER}
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN}
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
|
||||
PLUGIN="${PLUGIN}" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
PLIST_SUB= DB=${DB}
|
||||
|
@ -1,19 +1,25 @@
|
||||
SHLIB_NAME= libqsql${DB}.so
|
||||
|
||||
VPATH= ${DRIVER}
|
||||
VPATH= ${PLUGIN}:${DRIVER}
|
||||
CXXFLAGS+= -I${DRIVER} \
|
||||
-I${LOCALBASE}/include/Qt \
|
||||
-I${LOCALBASE}/include/postgresql/server \
|
||||
-I${LOCALBASE}/include -I${X11BASE}/include \
|
||||
${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
|
||||
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
|
||||
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
|
||||
-D_LARGEFILE_SOURCE -DQT_SHARED
|
||||
MOC?= ${LOCALBASE}/bin/moc-qt4
|
||||
LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq
|
||||
SRCS= qsql_${DB}.cpp
|
||||
SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/plugins/sqldrivers
|
||||
|
||||
${LIBDIR}:
|
||||
mkdir -p ${LIBDIR}
|
||||
|
||||
moc_qsql_${DB}.cpp: qsql_${DB}.h
|
||||
$(MOC) $(.ALLSRC) -o $(.TARGET)
|
||||
|
||||
beforeinstall: ${LIBDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
PORTNAME= qt4-${DB}-plugin
|
||||
PORTVERSION= 4.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_QT}
|
||||
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
|
||||
@ -23,11 +24,14 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql \
|
||||
|
||||
#USE_BZIP2= yes
|
||||
DRIVER= src/sql/drivers/${DB}
|
||||
PLUGIN= src/plugins/sqldrivers/${DB}
|
||||
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/include/QtSql \
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
|
||||
${DISTNAME}/include/QtSql \
|
||||
${DISTNAME}/src/sql/kernel
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
|
||||
PLUGIN="${PLUGIN}" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
PLIST_SUB= DB=${DB}
|
||||
|
@ -1,18 +1,24 @@
|
||||
SHLIB_NAME= libqsql${DB}.so
|
||||
|
||||
VPATH= ${DRIVER}
|
||||
VPATH= ${PLUGIN}:${DRIVER}
|
||||
CXXFLAGS+= -I${DRIVER} -Iinclude \
|
||||
-I${LOCALBASE}/include/Qt \
|
||||
-I${LOCALBASE}/include \
|
||||
${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
|
||||
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
|
||||
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
|
||||
-D_LARGEFILE_SOURCE -DQT_SHARED
|
||||
MOC?= ${LOCALBASE}/bin/moc-qt4
|
||||
LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite
|
||||
SRCS= qsql_${DB}.cpp
|
||||
SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/plugins/sqldrivers
|
||||
|
||||
${LIBDIR}:
|
||||
mkdir -p ${LIBDIR}
|
||||
|
||||
moc_qsql_${DB}.cpp: qsql_${DB}.h
|
||||
$(MOC) $(.ALLSRC) -o $(.TARGET)
|
||||
|
||||
beforeinstall: ${LIBDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
PORTNAME= qt4-${DB}-plugin
|
||||
PORTVERSION= 4.2.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= ${MASTER_SITE_QT}
|
||||
DISTNAME= qt-x11-opensource-src-${PORTVERSION}
|
||||
@ -23,11 +24,14 @@ LIB_DEPENDS+= QtSql:${PORTSDIR}/databases/qt4-sql \
|
||||
|
||||
#USE_BZIP2= yes
|
||||
DRIVER= src/sql/drivers/${DB}
|
||||
PLUGIN= src/plugins/sqldrivers/${DB}
|
||||
EXTRACT_AFTER_ARGS?=| ${TAR} -xf - \
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/include/QtSql \
|
||||
${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
|
||||
${DISTNAME}/include/QtSql \
|
||||
${DISTNAME}/src/sql/kernel
|
||||
MAKEFILE= ${FILESDIR}/Makefile.bsd
|
||||
MAKE_ENV+= DB="${DB}" DRIVER="${DRIVER}" \
|
||||
PLUGIN="${PLUGIN}" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
PLIST_SUB= DB=${DB}
|
||||
|
@ -1,18 +1,24 @@
|
||||
SHLIB_NAME= libqsql${DB}.so
|
||||
|
||||
VPATH= ${DRIVER}
|
||||
VPATH= ${PLUGIN}:${DRIVER}
|
||||
CXXFLAGS+= -I${DRIVER} -Iinclude \
|
||||
-I${LOCALBASE}/include/Qt \
|
||||
-I${LOCALBASE}/include \
|
||||
${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
|
||||
${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
|
||||
-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
|
||||
-D_LARGEFILE_SOURCE -DQT_SHARED
|
||||
MOC?= ${LOCALBASE}/bin/moc-qt4
|
||||
LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3
|
||||
SRCS= qsql_${DB}.cpp
|
||||
SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp
|
||||
|
||||
LIBDIR= ${PREFIX}/lib/plugins/sqldrivers
|
||||
|
||||
${LIBDIR}:
|
||||
mkdir -p ${LIBDIR}
|
||||
|
||||
moc_qsql_${DB}.cpp: qsql_${DB}.h
|
||||
$(MOC) $(.ALLSRC) -o $(.TARGET)
|
||||
|
||||
beforeinstall: ${LIBDIR}
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user