Skip to content

Commit

Permalink
Auto-update ocilib to v4.7.7 (#6182)
Browse files Browse the repository at this point in the history
* Update ocilib to v4.7.7

* add patch

---------

Co-authored-by: star9029 <hengxings783@gmail.com>
  • Loading branch information
waruqi and star-hengxing authored Jan 20, 2025
1 parent 802b349 commit 8cc5580
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
23 changes: 23 additions & 0 deletions packages/o/ocilib/patches/4.7.7/fix-gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 4b67124796225c6e1b6038ab1c9f11b232aa50fb Mon Sep 17 00:00:00 2001
From: Vincent Rogier <vince.rogier@ocilib.net>
Date: Mon, 20 Jan 2025 13:47:30 +0100
Subject: [PATCH] Fixed # #371 (missing cast leading compile falieur on gcc14
as -Wincompatible-pointer-types becomes default)

---
src/reference.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/reference.c b/src/reference.c
index d760420c..428318b7 100644
--- a/src/reference.c
+++ b/src/reference.c
@@ -443,7 +443,7 @@ boolean OcilibReferenceToString
}
else
{
- dbstr = str;
+ dbstr = (dbtext *) str;
}

CHECK_OCI
11 changes: 8 additions & 3 deletions packages/o/ocilib/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,25 @@ package("ocilib")
add_urls("https://github.com/vrogier/ocilib/archive/refs/tags/$(version).tar.gz",
"https://github.com/vrogier/ocilib.git")

add_versions("v4.7.7", "92822cc683048d3a2cddbbc7835062a02a9011ed2d7382da52a4c120e8c911ab")
add_versions("v4.7.6", "43f5093cac645518ad5bc8d6f48f5b77e12372ef84dc87ddb3a54c40e425bd26")

add_patches("4.7.7", "patches/4.7.7/fix-gcc14.patch", "33253876d5bdffe6fd74372a812a54733b58bdc25368a5205220ffb56984da5c")

add_configs("unicode", {description = "Enable Unicode", default = true, type = "boolean"})

on_install(function (package)
local configs = {
unicode = package:config("unicode")
}
if not package:config("shared") then
package:add("defines", "OCI_LIB_LOCAL_COMPILE")
end

io.replace("include/ocilibcpp/detail/core/SmartHandle.hpp",
".Set<SmartHandle*>",
".template Set<SmartHandle*>", {plain = true})

local configs = {
unicode = package:config("unicode")
}
os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua")
import("package.tools.xmake").install(package, configs)
end)
Expand Down

0 comments on commit 8cc5580

Please sign in to comment.