To comment on the following update, log in, then open the issue: http://www.openoffice.org/issues/show_bug.cgi?id=110460 Issue #|110460 Summary|mysqlc: lost buildfixes Component|Database access Version|OOO320m14 Platform|All URL| OS/Version|All Status|NEW Status whiteboard| Keywords| Resolution| Issue type|DEFECT Priority|P2 Subcomponent|MySQL Connector/OOo Assigned to|fs Reported by|rene
------- Additional comments from [email protected] Mon Mar 29 08:34:28 +0000 2010 ------- [ they are (as of now) in DEV300 and were in both cws mysqlnative and mysqlconnector) a) mysqlcppconn build breaks because it wants to link with -lmysqlcppconn which obviously is bogus. And that even is in SYSTEM_MYSQL conditional. diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk --- a/mysqlcppconn/mysql_config.pmk +++ b/mysqlcppconn/mysql_config.pmk @@ -35,13 +35,7 @@ .ENDIF .ENDIF -.IF "$(GUI)"!="WNT" - -.IF "$(SYSTEM_MYSQL)" == "YES" - MYSQL_LIB+=-lmysqlcppconn -.ENDIF - -.ELSE # "$(GUI)"!="WNT" +.IF "$(GUI)"=="WNT" CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS b) libmysqlcppconn is not .so.2 anymore since long ago (but so.4). Don't hardcode it but get it on the fly (yes, /usr/lib ia hardcoded, but that's where libs on Unix systems are..) diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -115,7 +115,7 @@ .IF "$(SYSTEM_MYSQL_CPPCONN)" != "YES" CDEFS += -DCPPCONN_LIB=\"$(DLLPRE)mysqlcppconn$(DLLPOST)\" .ELSE -CDEFS += -DCPPCONN_LIB=\"libmysqlcppconn.so.2\" +CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\" .ENDIF # --------------- MySQL settings ------------------ --------------------------------------------------------------------- Please do not reply to this automatically generated notification from Issue Tracker. Please log onto the website and enter your comments. http://qa.openoffice.org/issue_handling/project_issues.html#notification --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
