diff --git a/dev-db/libmysqlclient/libmysqlclient-6.1.6.recipe b/dev-db/libmysqlclient/libmysqlclient-6.1.6.recipe index 8658db410..71a248fb1 100644 --- a/dev-db/libmysqlclient/libmysqlclient-6.1.6.recipe +++ b/dev-db/libmysqlclient/libmysqlclient-6.1.6.recipe @@ -6,7 +6,7 @@ are speed, robustness and ease of use." HOMEPAGE="https://dev.mysql.com/downloads/connector/c/" COPYRIGHT="1997-2015 Oracle and/or its affiliates" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-6.1.6-src.tar.gz" CHECKSUM_SHA256="2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78" SOURCE_DIR="mysql-connector-c-6.1.6-src" @@ -15,13 +15,12 @@ PATCHES="libmysqlclient-6.1.6.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +libVersion="18.3.0" +libVersionCompat="$libVersion compat >= ${libVersion%.*}" + PROVIDES=" - libmysqlclient$secondaryArchSuffix = 18.3.0 compat >= 18.3 - cmd:my_print_defaults$secondaryArchSuffix - cmd:mysql_config$secondaryArchSuffix - cmd:perror$secondaryArchSuffix - lib:libmysqlclient$secondaryArchSuffix = 18.3.0 compat >= 18.3 - lib:libmysqlclient_r$secondaryArchSuffix = 18.3.0 compat >= 18.3 + libmysqlclient$secondaryArchSuffix = $portVersion + lib:libmysqlclient$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -29,12 +28,23 @@ REQUIRES=" " PROVIDES_devel=" - libmysqlclient${secondaryArchSuffix}_devel = 18.3.0 compat >= 18.3 - devel:libmysqlclient$secondaryArchSuffix = 18.3.0 compat >= 18.3 - devel:libmysqlclient_r$secondaryArchSuffix = 18.3.0 compat >= 18.3 + libmysqlclient${secondaryArchSuffix}_devel = $portVersion + cmd:mysql_config$secondaryArchSuffix + devel:libmysqlclient$secondaryArchSuffix = $libVersionCompat + devel:libmysqlclient_r$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - libmysqlclient$secondaryArchSuffix == 18.3.0 + libmysqlclient$secondaryArchSuffix == $portVersion base + " + +PROVIDES_tools=" + libmysqlclient${secondaryArchSuffix}_tools = $portVersion + cmd:my_print_defaults$secondaryArchSuffix + cmd:perror$secondaryArchSuffix + " +REQUIRES_tools=" + haiku$secondaryArchSuffix + libmysqlclient$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -48,6 +58,11 @@ BUILD_PREREQUIRES=" cmd:make " +defineDebugInfoPackage libmysqlclient$secondaryArchSuffix \ + $libDir/libmysqlclient.so.$libVersion \ + "$(getPackagePrefix tools)/$relativeBinDir"/perror \ + "$(getPackagePrefix tools)/$relativeBinDir"/my_print_defaults + BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DINSTALL_BINDIR=$relativeBinDir \ @@ -65,9 +80,14 @@ INSTALL() mkdir -p $developLibDir mv $libDir/libmysqlclient_r.a $developLibDir - prepareInstalledDevelLibs libmysqlclient + prepareInstalledDevelLibs libmysqlclient libmysqlclient_r - packageEntries devel $developDir + packageEntries devel $developDir \ + $binDir/mysql_config + + packageEntries tools \ + $binDir/my_print_defaults \ + $binDir/perror rm $prefix/COPYING rm $prefix/README diff --git a/dev-db/libmysqlclient/patches/libmysqlclient-6.1.6.patchset b/dev-db/libmysqlclient/patches/libmysqlclient-6.1.6.patchset index 7bc7d553b..09ca66645 100644 --- a/dev-db/libmysqlclient/patches/libmysqlclient-6.1.6.patchset +++ b/dev-db/libmysqlclient/patches/libmysqlclient-6.1.6.patchset @@ -1,4 +1,4 @@ -From 9c16dce27dbbc7b69932b52125b70bc2ee3e2a18 Mon Sep 17 00:00:00 2001 +From 7340e870fc8846069b6e955161dd8f1a6fc0e3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 29 Aug 2018 13:34:46 +0300 @@ -136,5 +136,106 @@ index cb8599d..49d8e3f 100644 # -- -2.16.4 +2.24.0 + + +From 0124d20f7f0c26d57c7a44598977b86081714520 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 9 Nov 2019 17:41:18 +0100 +Subject: 32bit fixes for int32, uint32 + + +diff --git a/extra/resolveip.c b/extra/resolveip.c +index 54ce3eb..2f505dc 100644 +--- a/extra/resolveip.c ++++ b/extra/resolveip.c +@@ -41,7 +41,11 @@ + extern int h_errno; + #endif + ++#if defined(__HAIKU__) ++#include ++#else + typedef uint32 in_addr_t; ++#endif + + static my_bool silent; + +diff --git a/include/my_global.h b/include/my_global.h +index acadb44..b95c02b 100644 +--- a/include/my_global.h ++++ b/include/my_global.h +@@ -458,8 +458,12 @@ typedef unsigned char uint8; /* Unsigned integer >= 8 bits */ + typedef short int16; + typedef unsigned short uint16; + #if SIZEOF_INT == 4 ++#if defined(__HAIKU__) ++#include ++#else + typedef int int32; + typedef unsigned int uint32; ++#endif + #elif SIZEOF_LONG == 4 + typedef long int32; + typedef unsigned long uint32; +-- +2.24.0 + + +From 860d4df086c1762169c6a9c87e1996f6d7a4767e Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 9 Nov 2019 17:45:50 +0100 +Subject: 64bit fix for int64, uint64 + + +diff --git a/include/my_global.h b/include/my_global.h +index b95c02b..baff70a 100644 +--- a/include/my_global.h ++++ b/include/my_global.h +@@ -481,8 +481,12 @@ typedef unsigned long ulong; /* Short for unsigned long */ + */ + typedef unsigned long long int ulonglong; /* ulong or unsigned long long */ + typedef long long int longlong; ++#if defined(__HAIKU__) ++#include ++#else + typedef longlong int64; + typedef ulonglong uint64; ++#endif + + #if defined (_WIN32) + typedef unsigned __int64 my_ulonglong; +-- +2.24.0 + + +From 5692920f18f8419a21dbca3df87d676c085a933d Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 9 Nov 2019 20:45:49 +0100 +Subject: Add -lnetwork search + + +diff --git a/configure.cmake b/configure.cmake +index a4f5e8f..5052084 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -308,6 +308,7 @@ IF(UNIX) + MY_SEARCH_LIBS(bind "bind;socket" LIBBIND) + MY_SEARCH_LIBS(crypt crypt LIBCRYPT) + MY_SEARCH_LIBS(setsockopt socket LIBSOCKET) ++ MY_SEARCH_LIBS(socket network LIBNETWORK) + MY_SEARCH_LIBS(dlopen dl LIBDL) + MY_SEARCH_LIBS(sched_yield rt LIBRT) + IF(NOT LIBRT) +@@ -316,7 +317,7 @@ IF(UNIX) + MY_SEARCH_LIBS(timer_create rt LIBRT) + + SET(CMAKE_REQUIRED_LIBRARIES +- ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT}) ++ ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBCRYPT} ${LIBSOCKET} ${LIBDL} ${LIBNETWORK} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT}) + # Need explicit pthread for gcc -fsanitize=address + IF(CMAKE_C_FLAGS MATCHES "-fsanitize=") + SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread) +-- +2.24.0