[gentoo-commits] gentoo-x86 commit in dev-db/mysql-connector-c++/files: mysql-connector-c++-1.1.0-disable-tests.patch mysql-connector-c++-1.1.0-fix-cmake.patch mysql-connector-c++-1.1.0_pre814-libdir.patch

[Tomas Chvatal (scarabeus)]

scarabeus    11/07/30 12:20:51

  Added:                mysql-connector-c++-1.1.0-disable-tests.patch
                        mysql-connector-c++-1.1.0-fix-cmake.patch
  Removed:              mysql-connector-c++-1.1.0_pre814-libdir.patch
  Log:
  Version bump to 1.1.0 ebuild and cmake patch from Jorge (jmbsvicetto) updated by me to not cause any error. Tested and confirmed working with libreoffice.
  
  (Portage version: 2.2.0_alpha49/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch?rev=1.1&content-type=text/plain

Index: mysql-connector-c++-1.1.0-disable-tests.patch
===================================================================
diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt	2009-08-20 22:25:35.000000000 +0200
+++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt	2009-08-20 22:25:57.000000000 +0200
@@ -241,10 +241,6 @@
 ADD_SUBDIRECTORY(cppconn)
 ADD_SUBDIRECTORY(driver)
 ADD_SUBDIRECTORY(examples)
-ADD_SUBDIRECTORY(test)
-ADD_SUBDIRECTORY(test/framework)
-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
-ADD_SUBDIRECTORY(test/unit)
 
 IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
 	# see also README



1.1                  dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch?rev=1.1&content-type=text/plain

Index: mysql-connector-c++-1.1.0-fix-cmake.patch
===================================================================
diff -urN mysql-connector-c++-1.1.0.old/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt
--- mysql-connector-c++-1.1.0.old/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
+++ mysql-connector-c++-1.1.0/CMakeLists.txt	2011-07-30 13:16:18.000000000 +0200
@@ -232,7 +232,7 @@
 	"install_manifest.txt")
 SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_DRAFT" )
 
-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$")
+SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$")
 SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
 SET(CPACK_SOURCE_GENERATOR "TGZ")
 
diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt
--- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
+++ mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt	2011-07-30 14:10:34.000000000 +0200
@@ -55,7 +55,7 @@
 
 SET(MYSQLCPPCONN_INSTALL_HEADERS
 		build_config.h
-		config.h
+		${CMAKE_CURRENT_BINARY_DIR}/config.h
 		connection.h
 		datatype.h
 		driver.h
diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
--- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
+++ mysql-connector-c++-1.1.0/driver/CMakeLists.txt	2011-07-30 13:20:36.000000000 +0200
@@ -26,6 +26,9 @@
 
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
+INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
 INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
 MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
 
@@ -149,20 +152,22 @@
 		nativeapi/native_statement_wrapper.h
 		nativeapi/mysql_native_resultset_wrapper.h
 		nativeapi/native_resultset_wrapper.h
-		../cppconn/warning.h
-		../cppconn/statement.h
-		../cppconn/sqlstring.h
-		../cppconn/resultset_metadata.h
-		../cppconn/resultset.h
-		../cppconn/prepared_statement.h
-		../cppconn/parameter_metadata.h
-		../cppconn/metadata.h
-		../cppconn/exception.h
-		../cppconn/driver.h
-		../cppconn/datatype.h
-		../cppconn/connection.h
-		../cppconn/config.h
-		../cppconn/build_config.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
+		${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
+		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
+		${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
 
 	)
 
@@ -271,8 +276,8 @@
 	)
 ELSE(WIN32)
 	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
+		LIBRARY DESTINATION lib${LIB_SUFFIX}
+		ARCHIVE DESTINATION lib${LIB_SUFFIX}
 	)
 ENDIF(WIN32)