diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-11-30 09:41:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 09:41:33 -0800 |
| commit | 9d72e33d518772c464f7d30b989071907a6acbd7 (patch) | |
| tree | 74ded811a2e6044e19f36ec088b6f0c49096e7b2 /ports/freetds/fix-encoding-h-dependency.patch | |
| parent | 480ec85d5189f4b483de325f96c8d8ccdbcb1153 (diff) | |
| download | vcpkg-9d72e33d518772c464f7d30b989071907a6acbd7.tar.gz vcpkg-9d72e33d518772c464f7d30b989071907a6acbd7.zip | |
[freetds] Remove patches and update to a version that no longer needs them (#14529)
* [freetds] Remove patches and update to a version that no longer needs them
Upstream seems to have version numbered releases but they aren't explicitly numbered well in GitHub, so I've intentionally changed the version-string to something unorderable for now.
* Also update to 1.2.11.
* Update ports/freetds/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/freetds/fix-encoding-h-dependency.patch')
| -rw-r--r-- | ports/freetds/fix-encoding-h-dependency.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/ports/freetds/fix-encoding-h-dependency.patch b/ports/freetds/fix-encoding-h-dependency.patch deleted file mode 100644 index 7b2909fec..000000000 --- a/ports/freetds/fix-encoding-h-dependency.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt
-index 5d036a1..031b9a2 100644
---- a/src/odbc/CMakeLists.txt
-+++ b/src/odbc/CMakeLists.txt
-@@ -30,7 +30,7 @@ add_library(tdsodbc SHARED
- target_compile_definitions(tdsodbc PUBLIC DLL_EXPORT=1)
- # TODO libiconv, odbcinstlib and other dynamics
- target_link_libraries(tdsodbc tds replacements tdsutils ${libs} ${lib_NETWORK} ${lib_BASE})
--
-+add_dependencies(tdsodbc generate_encodings_h)
- if(MINGW OR CYGWIN)
- set_target_properties(tdsodbc PROPERTIES LINK_FLAGS "--static -Wl,--kill-at -Wl,--enable-stdcall-fixup")
- endif(MINGW OR CYGWIN)
-@@ -41,6 +41,7 @@ add_library(tdsodbc_static STATIC
- native.c sql2tds.c error.c odbc_checks.c sqlwchar.c sqlwparams.h
- odbc_export.h error_export.h odbc_data.c ${win_SRCS}
- )
-+add_dependencies(tdsodbc_static generate_encodings_h)
- if (NOT WIN32)
- set_target_properties(tdsodbc_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
- endif()
-diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt
-index d8be1a0..42b6a4d 100644
---- a/src/tds/CMakeLists.txt
-+++ b/src/tds/CMakeLists.txt
-@@ -29,6 +29,8 @@ if(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure")
- WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
- endif(PERL_FOUND AND NOT EXISTS "${CMAKE_SOURCE_DIR}/configure")
-
-+add_custom_target(generate_encodings_h DEPENDS "${CMAKE_BINARY_DIR}/include/freetds/encodings.h")
-+
- if(WIN32)
- set(add_SRCS sspi.c)
- else(WIN32)
-@@ -44,9 +46,9 @@ add_library(tds STATIC
- bulk.c packet.c stream.c random.c
- sec_negotiate_gnutls.h sec_negotiate_openssl.h sec_negotiate.c gssapi.c
- tds_willconvert.h num_limits.h tds_types.h
-- "${CMAKE_BINARY_DIR}/include/freetds/encodings.h"
- ${add_SRCS}
- )
-+add_dependencies(tds generate_encodings_h)
- if (NOT WIN32)
- set_target_properties(tds PROPERTIES POSITION_INDEPENDENT_CODE ON)
- endif()
|