From 553561172a43e9a54b25e6dc728660536d1bdd1c Mon Sep 17 00:00:00 2001 From: Ray Chang Date: Fri, 19 Apr 2024 00:54:05 +1000 Subject: [PATCH] Fix for compilation errors due to libei naming conflicts Signed-off-by: Ray Chang --- .../0002-erlang-libei-arch-compile.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/erlang/26.2.4/0002-erlang-libei-arch-compile.patch diff --git a/package/erlang/26.2.4/0002-erlang-libei-arch-compile.patch b/package/erlang/26.2.4/0002-erlang-libei-arch-compile.patch new file mode 100644 index 0000000000..5a3c729289 --- /dev/null +++ b/package/erlang/26.2.4/0002-erlang-libei-arch-compile.patch @@ -0,0 +1,31 @@ +From 442b23d9dd8d5d66fe70ceef31be7531ac75fa56 Mon Sep 17 00:00:00 2001 +From: Ray Chang +Date: Fri, 19 Apr 2024 00:47:58 +1000 +Subject: [PATCH] Fix for compilation errors due to libei naming conflicts. + +Signed-off-by: Ray Chang +--- + 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 d1b26743a6..03ed314f6a 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@ + +-- +2.44.0 + -- 2.34.1