Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 341410 Details for
Bug 442322
dev-db/myodbc-5.1.6 - Build fails against dev-db/mysql-5.5.28 - error: too many arguments to function 'my_free'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
myodbc-5.2.4-cmake.patch
myodbc-5.2.4-cmake.patch (text/plain), 2.72 KB, created by
Bernd Feige
on 2013-03-09 11:36:33 UTC
(
hide
)
Description:
myodbc-5.2.4-cmake.patch
Filename:
MIME Type:
Creator:
Bernd Feige
Created:
2013-03-09 11:36:33 UTC
Size:
2.72 KB
patch
obsolete
>=== modified file 'CMakeLists.txt' >--- CMakeLists.txt 2013-03-09 09:51:06 +0000 >+++ CMakeLists.txt 2013-03-09 11:05:27 +0000 >@@ -33,6 +33,12 @@ > SET(CONNECTOR_MAJOR "5") > SET(CONNECTOR_MINOR "2") > >+IF(WITH_DOCUMENTATION_INSTALL_PATH) >+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH}) >+ELSE(WITH_DOCUMENTATION_INSTALL_PATH) >+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}) >+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH) >+ > IF(CONNECTOR_MINOR LESS 10) > SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}") > ELSE(CONNECTOR_MINOR LESS 10) >@@ -329,19 +335,19 @@ > > ELSE(WIN32) > >- INSTALL(FILES ChangeLog DESTINATION .) >- INSTALL(FILES README DESTINATION .) >- INSTALL(FILES README.debug DESTINATION .) >- INSTALL(FILES INSTALL DESTINATION .) >+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH}) >+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH}) >+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH}) >+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH}) > IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING") >- INSTALL(FILES COPYING DESTINATION .) >+ INSTALL(FILES COPYING DESTINATION ${DOCUMENTATION_INSTALL_PATH}) > ELSE() >- INSTALL(FILES LICENSE.mysql DESTINATION .) >+ INSTALL(FILES LICENSE.mysql DESTINATION ${DOCUMENTATION_INSTALL_PATH}) > ENDIF() > > ENDIF(WIN32) > >-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .) >+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH}) > > INCLUDE(CPack) > > >=== modified file 'test/CMakeLists.txt' >--- test/CMakeLists.txt 2013-03-09 10:51:08 +0000 >+++ test/CMakeLists.txt 2013-03-09 11:02:57 +0000 >@@ -22,6 +22,12 @@ > > ########################################################################## > >+IF(WITH_TEST_INSTALL_PATH) >+ SET(TEST_INSTALL_PATH ${WITH_TEST_INSTALL_PATH}) >+ELSE(WITH_TEST_INSTALL_PATH) >+ SET(TEST_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR}/test) >+ENDIF(WITH_TEST_INSTALL_PATH) >+ > INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test) > > # put the test exe's in test/ >@@ -44,7 +50,7 @@ > my_types my_unicode my_unixodbc my_use_result my_bug13766) > ADD_EXECUTABLE(${T} ${T}.c) > >- INSTALL(TARGETS ${T} DESTINATION test COMPONENT tests) >+ INSTALL(TARGETS ${T} DESTINATION ${TEST_INSTALL_PATH} COMPONENT tests) > > IF(WIN32) > TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB}) >@@ -59,6 +65,6 @@ > ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake > ${CMAKE_CURRENT_BINARY_DIR}/odbc.ini > ${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini >- DESTINATION test COMPONENT tests) >+ DESTINATION ${TEST_INSTALL_PATH} COMPONENT tests) > > >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 442322
:
329318
|
329320
|
329444
|
341408
| 341410