From 3c404b4e96839a8c091c493b88fa5d376604c7d6 Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Thu, 19 May 2022 23:28:41 +0200 Subject: [PATCH] [unixodbc] no absolute paths --- ports/unixodbc/portfile.cmake | 18 ++++++++++-------- ports/unixodbc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/u-/unixodbc.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index 46d59a1b9cae8e..c2d5f9776372c4 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -39,14 +39,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man7" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +foreach(FILE config.h unixodbc_conf.h) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/${FILE}" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "") +endforeach() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json index 3602c057d753eb..4f3457179b6258 100644 --- a/ports/unixodbc/vcpkg.json +++ b/ports/unixodbc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "unixodbc", "version": "2.3.11", + "port-version": 1, "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 98000cfabe47b5..10013131dd48ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7218,7 +7218,7 @@ }, "unixodbc": { "baseline": "2.3.11", - "port-version": 0 + "port-version": 1 }, "unqlite": { "baseline": "1.1.9", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index 0c8f6a98b59611..394daa07c112fe 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5bf2c65c912060aaebaba66eb6ce1544d6dd7e6", + "version": "2.3.11", + "port-version": 1 + }, { "git-tree": "3042b55f1c0ecd0d27336b24754a6f5f3a746c03", "version": "2.3.11",