summaryrefslogtreecommitdiff
path: root/src/logic
diff options
context:
space:
mode:
Diffstat (limited to 'src/logic')
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_archive.c2
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_argv.c18
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_deps.c2
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_dsolib.c2
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_executable.c2
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_host.c2
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_implib.c2
-rw-r--r--src/logic/slbt_exec_ar.c2
-rw-r--r--src/logic/slbt_exec_compile.c2
-rw-r--r--src/logic/slbt_exec_ctx.c10
-rw-r--r--src/logic/slbt_exec_execute.c2
-rw-r--r--src/logic/slbt_exec_install.c2
-rw-r--r--src/logic/slbt_exec_link.c2
-rw-r--r--src/logic/slbt_exec_stoolie.c57
-rw-r--r--src/logic/slbt_exec_uninstall.c2
15 files changed, 93 insertions, 16 deletions
diff --git a/src/logic/linkcmd/slbt_linkcmd_archive.c b/src/logic/linkcmd/slbt_linkcmd_archive.c
index b7c090b..55e9ba7 100644
--- a/src/logic/linkcmd/slbt_linkcmd_archive.c
+++ b/src/logic/linkcmd/slbt_linkcmd_archive.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/linkcmd/slbt_linkcmd_argv.c b/src/logic/linkcmd/slbt_linkcmd_argv.c
index 013317f..b5865da 100644
--- a/src/logic/linkcmd/slbt_linkcmd_argv.c
+++ b/src/logic/linkcmd/slbt_linkcmd_argv.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
@@ -1027,6 +1027,22 @@ slbt_hidden int slbt_exec_link_finalize_argument_vector(
}
}
+ /* replace -lltdl with -lsltdl as needed */
+ if (dctx->cctx->drvflags & SLBT_DRIVER_PREFER_SLTDL) {
+ struct slbt_exec_ctx_impl * ictx;
+
+ ictx = slbt_get_exec_ictx(ectx);
+
+ for (src=ectx->argv; *src; src++)
+ if ((src[0][0] == '-') && (src[0][1] == 'l'))
+ if ((src[0][2] == 'l')
+ && (src[0][3] == 't')
+ && (src[0][4] == 'd')
+ && (src[0][5] == 'l'))
+ if (!src[0][6])
+ *src = ictx->lsltdl;
+ }
+
/* properly null-terminate argv, accounting for redundant -l arguments */
*dst = 0;
diff --git a/src/logic/linkcmd/slbt_linkcmd_deps.c b/src/logic/linkcmd/slbt_linkcmd_deps.c
index 19ed716..30dd040 100644
--- a/src/logic/linkcmd/slbt_linkcmd_deps.c
+++ b/src/logic/linkcmd/slbt_linkcmd_deps.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/linkcmd/slbt_linkcmd_dsolib.c b/src/logic/linkcmd/slbt_linkcmd_dsolib.c
index cca6aac..2386bad 100644
--- a/src/logic/linkcmd/slbt_linkcmd_dsolib.c
+++ b/src/logic/linkcmd/slbt_linkcmd_dsolib.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/linkcmd/slbt_linkcmd_executable.c b/src/logic/linkcmd/slbt_linkcmd_executable.c
index 936bc02..ee66061 100644
--- a/src/logic/linkcmd/slbt_linkcmd_executable.c
+++ b/src/logic/linkcmd/slbt_linkcmd_executable.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/linkcmd/slbt_linkcmd_host.c b/src/logic/linkcmd/slbt_linkcmd_host.c
index c3d51f8..304ad5d 100644
--- a/src/logic/linkcmd/slbt_linkcmd_host.c
+++ b/src/logic/linkcmd/slbt_linkcmd_host.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/linkcmd/slbt_linkcmd_implib.c b/src/logic/linkcmd/slbt_linkcmd_implib.c
index b2c0375..b7403a8 100644
--- a/src/logic/linkcmd/slbt_linkcmd_implib.c
+++ b/src/logic/linkcmd/slbt_linkcmd_implib.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/slbt_exec_ar.c b/src/logic/slbt_exec_ar.c
index ba56f5b..50ff864 100644
--- a/src/logic/slbt_exec_ar.c
+++ b/src/logic/slbt_exec_ar.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/slbt_exec_compile.c b/src/logic/slbt_exec_compile.c
index 47d8e72..930876d 100644
--- a/src/logic/slbt_exec_compile.c
+++ b/src/logic/slbt_exec_compile.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/slbt_exec_ctx.c b/src/logic/slbt_exec_ctx.c
index 223be17..9d39144 100644
--- a/src/logic/slbt_exec_ctx.c
+++ b/src/logic/slbt_exec_ctx.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
@@ -131,6 +131,9 @@ static struct slbt_exec_ctx_impl * slbt_exec_ctx_alloc(
size += exts * SLBT_ECTX_LIB_EXTRAS;
}
+ /* -lsltdl (--prefer-sltdl impl.) */
+ size += 8;
+
/* string buffers: args, shadow */
if (!(args = malloc(size)))
return 0;
@@ -629,6 +632,11 @@ int slbt_ectx_get_exec_ctx(
}
+ /* -lsltdl (--prefer-sltdl impl.) */
+ ictx->lsltdl = ch;
+ strcpy(ch,"-lsltdl");
+ ch += 8;
+
/* dlopen, dlpreopen */
if ((dlopenv = idctx->dlopenv), (dlactxv = ictx->dlactxv)) {
if (slbt_ar_get_varchive_ctx(dctx,dlactxv) < 0)
diff --git a/src/logic/slbt_exec_execute.c b/src/logic/slbt_exec_execute.c
index 7f9389b..6892af6 100644
--- a/src/logic/slbt_exec_execute.c
+++ b/src/logic/slbt_exec_execute.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c
index 228d2ff..bd85465 100644
--- a/src/logic/slbt_exec_install.c
+++ b/src/logic/slbt_exec_install.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c
index 50709d3..f6a0bc1 100644
--- a/src/logic/slbt_exec_link.c
+++ b/src/logic/slbt_exec_link.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
diff --git a/src/logic/slbt_exec_stoolie.c b/src/logic/slbt_exec_stoolie.c
index 779146a..d8cd9c0 100644
--- a/src/logic/slbt_exec_stoolie.c
+++ b/src/logic/slbt_exec_stoolie.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
@@ -87,13 +87,18 @@ static int slbt_exec_stoolie_perform_actions(
char m4dir [PATH_MAX];
char auxdir[PATH_MAX];
char slibm4[PATH_MAX];
+ char sltdl [PATH_MAX];
+ char m4tag [PATH_MAX];
char ltmain[PATH_MAX];
char arlib [PATH_MAX];
bool fslibm4;
bool fltmain;
+ bool fsysltdl;
ictx = slbt_get_stoolie_ictx(stctx);
+ fsysltdl = !(dctx->cctx->drvflags & SLBT_DRIVER_PREFER_SLTDL);
+
/* source files */
if (slbt_snprintf(
slibm4,sizeof(slibm4),"%s/%s",
@@ -102,6 +107,12 @@ static int slbt_exec_stoolie_perform_actions(
return SLBT_BUFFER_ERROR(dctx);
if (slbt_snprintf(
+ sltdl,sizeof(sltdl),"%s/%s",
+ SLBT_PACKAGE_DATADIR,
+ "sltdl.m4") < 0)
+ return SLBT_BUFFER_ERROR(dctx);
+
+ if (slbt_snprintf(
ltmain,sizeof(ltmain),"%s/%s",
SLBT_PACKAGE_DATADIR,
"ltmain.sh") < 0)
@@ -119,6 +130,14 @@ static int slbt_exec_stoolie_perform_actions(
if (slbt_exec_stoolie_remove_file(dctx,ictx->fdm4,"slibtool.m4") < 0)
return SLBT_NESTED_ERROR(dctx);
+ if (ictx->fdm4 >= 0)
+ if (slbt_exec_stoolie_remove_file(dctx,ictx->fdm4,"sltdl.m4") < 0)
+ return SLBT_NESTED_ERROR(dctx);
+
+ if (ictx->fdm4 >= 0)
+ if (slbt_exec_stoolie_remove_file(dctx,ictx->fdm4,"sysltdl.tag") < 0)
+ return SLBT_NESTED_ERROR(dctx);
+
if (slbt_exec_stoolie_remove_file(dctx,ictx->fdaux,"ltmain.sh") < 0)
return SLBT_NESTED_ERROR(dctx);
@@ -158,8 +177,20 @@ static int slbt_exec_stoolie_perform_actions(
if (slbt_realpath(ictx->fdm4,".",0,m4dir,sizeof(m4dir)) < 0)
return SLBT_SYSTEM_ERROR(dctx,0);
+ if (slbt_snprintf(
+ m4tag,sizeof(m4tag),"%s/%s",
+ m4dir,"sysltdl.tag") < 0)
+ return SLBT_BUFFER_ERROR(dctx);
+
if (slbt_util_copy_file(ectx,slibm4,m4dir) < 0)
return SLBT_NESTED_ERROR(dctx);
+
+ if (slbt_util_copy_file(ectx,sltdl,m4dir) < 0)
+ return SLBT_NESTED_ERROR(dctx);
+
+ if (fsysltdl)
+ if (slbt_util_copy_file(ectx,"/dev/null",m4tag) < 0)
+ return SLBT_NESTED_ERROR(dctx);
}
if (fltmain) {
@@ -174,7 +205,7 @@ static int slbt_exec_stoolie_perform_actions(
}
} else {
/* default to symlinks */
- if (fslibm4)
+ if (fslibm4) {
if (slbt_create_symlink_ex(
dctx,ectx,
ictx->fdm4,
@@ -183,6 +214,24 @@ static int slbt_exec_stoolie_perform_actions(
SLBT_SYMLINK_LITERAL) < 0)
return SLBT_NESTED_ERROR(dctx);
+ if (slbt_create_symlink_ex(
+ dctx,ectx,
+ ictx->fdm4,
+ sltdl,
+ "sltdl.m4",
+ SLBT_SYMLINK_LITERAL) < 0)
+ return SLBT_NESTED_ERROR(dctx);
+
+ if (fsysltdl)
+ if (slbt_create_symlink_ex(
+ dctx,ectx,
+ ictx->fdm4,
+ "/dev/null",
+ "sysltdl.tag",
+ SLBT_SYMLINK_LITERAL) < 0)
+ return SLBT_NESTED_ERROR(dctx);
+ }
+
if (fltmain) {
if (slbt_create_symlink_ex(
dctx,ectx,
@@ -311,6 +360,10 @@ int slbt_exec_stoolie(const struct slbt_driver_ctx * dctx)
ictx->cctx.drvflags &= ~(uint64_t)SLBT_DRIVER_SILENT;
ictx->cctx.drvflags |= SLBT_DRIVER_VERBOSE;
break;
+
+ case TAG_STLE_SYSTEM_LTDL:
+ ictx->cctx.drvflags &= ~(uint64_t)SLBT_DRIVER_PREFER_SLTDL;
+ break;
}
if (entry->fval) {
diff --git a/src/logic/slbt_exec_uninstall.c b/src/logic/slbt_exec_uninstall.c
index 98bd85b..04ae645 100644
--- a/src/logic/slbt_exec_uninstall.c
+++ b/src/logic/slbt_exec_uninstall.c
@@ -1,6 +1,6 @@
/*******************************************************************/
/* slibtool: a strong libtool implementation, written in C */
-/* Copyright (C) 2016--2024 SysDeer Technologies, LLC */
+/* Copyright (C) 2016--2025 SysDeer Technologies, LLC */
/* Released under the Standard MIT License; see COPYING.SLIBTOOL. */
/*******************************************************************/
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 12:35:47 +0000