From 41c81922aa8af427d31d3550762dbbef0cd658f8 Mon Sep 17 00:00:00 2001 From: Sacha Date: Wed, 13 Mar 2024 13:28:41 +0100 Subject: [PATCH 1/2] Change libs order to avoid picking up system libei --- lib/odbc/c_src/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in index d1b26743a6a4..03ed314f6a26 100644 --- a/lib/odbc/c_src/Makefile.in +++ b/lib/odbc/c_src/Makefile.in @@ -80,10 +80,10 @@ ODBC_INCLUDE = @ODBC_INCLUDE@ # ---------------------------------------------------- CC = @CC@ CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@ -EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET) +EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET) $(EI_LIB) LD = @LD@ -LDFLAGS = $(ODBC_LIB) $(EI_LDFLAGS) -LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB) +LDFLAGS = $(EI_LDFLAGS) $(ODBC_LIB) +LIBS = @LIBS@ @THR_LIBS@ INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE) TARGET_FLAGS = @TARGET_FLAGS@ From 1db900d3098eda5c738b13e419d5a4d7c38ff7d1 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 7 Jun 2024 14:34:39 -0300 Subject: [PATCH 2/2] chore: bump otp version --- OTP_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OTP_VERSION b/OTP_VERSION index 6013fd8434ce..b54695926159 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -26.2.5-1 +26.2.5-2