Author: arekm Date: Thu Feb 3 11:04:52 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 18; hacky way to make it building
---- Files affected: packages/mysqlcc: mysqlcc.spec (1.42 -> 1.43) , mysqlcc-mysql55-link.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mysqlcc/mysqlcc.spec diff -u packages/mysqlcc/mysqlcc.spec:1.42 packages/mysqlcc/mysqlcc.spec:1.43 --- packages/mysqlcc/mysqlcc.spec:1.42 Tue Feb 1 12:47:44 2011 +++ packages/mysqlcc/mysqlcc.spec Thu Feb 3 12:04:46 2011 @@ -7,7 +7,7 @@ Name: mysqlcc Group: Applications/Databases Version: 0.9.4 -Release: 17 +Release: 18 License: GPL Source0: http://sunsite.icm.edu.pl/mysql/Downloads/MySQLCC/%{name}-%{version}-src.tar.gz # Source0-md5: 26ee3528dce690b227d8bfb71b46ae66 @@ -18,13 +18,20 @@ Patch3: %{name}-enablessl.patch Patch4: %{name}-reconnect.patch Patch5: %{name}-gptr.patch +Patch6: %{name}-mysql55-link.patch URL: http://www.mysql.com/products/mysqlcc/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png BuildRequires: autoconf BuildRequires: automake %{!?with_mysql40:BuildRequires: mysql-devel >= 4.1.0} -%{?with_mysql40:BuildRequires: mysql-devel >= 4.0.0} +%if %{with mysql40} +BuildRequires: mysql-devel >= 4.0.0 +# mysqlcc uses some internal functions from mysql which are no longer exported +# in dynamic version. Linkt these functions statically while the rest of mysql +# functions dynamicly (see mysql55-link.patch) +BuildRequires: mysql-static >= 4.0.0 +%endif BuildRequires: qmake BuildRequires: qt-devel >= 3:3.0.5 BuildRequires: zlib-devel @@ -46,6 +53,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build cp -f /usr/share/automake/config.sub . @@ -53,6 +61,7 @@ %{__autoconf} QTDIR=%{_prefix}; export QTDIR QMAKESPEC=%{_datadir}/qt/mkspecs/linux-g++; export QMAKESPEC +LDFLAGS="%{rpmldflags} -Wl,-static -lmysqlclient -Wl,-Bdynamic"; export LDFLAGS %configure \ --with-mysql-lib=%{_libdir} %{__make} @@ -97,6 +106,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.43 2011/02/03 11:04:46 arekm +- rel 18; hacky way to make it building + Revision 1.42 2011/02/01 11:47:44 arekm - release 17 ================================================================ Index: packages/mysqlcc/mysqlcc-mysql55-link.patch diff -u /dev/null packages/mysqlcc/mysqlcc-mysql55-link.patch:1.1 --- /dev/null Thu Feb 3 12:04:52 2011 +++ packages/mysqlcc/mysqlcc-mysql55-link.patch Thu Feb 3 12:04:46 2011 @@ -0,0 +1,11 @@ +--- mysqlcc-0.9.4-src/mysqlcc.pro.in~ 2003-12-14 00:10:43.000000000 +0100 ++++ mysqlcc-0.9.4-src/mysqlcc.pro.in 2011-02-03 12:00:47.337516516 +0100 +@@ -27,7 +27,7 @@ + } + + unix { +- LIBS += @MYSQL_LIB@ ++ LIBS += @MYSQL_LIB@ -Wl,-static -lmysqlclient -Wl,-Bdynamic -lpthread + INCLUDEPATH += @MYSQL_INCLUDE@ + CONFIG += x11 + OBJECTS_DIR = tmp ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysqlcc/mysqlcc.spec?r1=1.42&r2=1.43&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
