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.c2
-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.c2
-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.c33
-rw-r--r--src/logic/slbt_exec_uninstall.c2
15 files changed, 39 insertions, 22 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 546c8d5..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. */
/*******************************************************************/
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 f76990a..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. */
/*******************************************************************/
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 8061833..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. */
/*******************************************************************/
@@ -88,16 +88,16 @@ static int slbt_exec_stoolie_perform_actions(
char auxdir[PATH_MAX];
char slibm4[PATH_MAX];
char sltdl [PATH_MAX];
- char m4ltdl[PATH_MAX];
+ char m4tag [PATH_MAX];
char ltmain[PATH_MAX];
char arlib [PATH_MAX];
bool fslibm4;
- bool fsltdl;
bool fltmain;
+ bool fsysltdl;
ictx = slbt_get_stoolie_ictx(stctx);
- fsltdl = (dctx->cctx->drvflags & SLBT_DRIVER_PREFER_SLTDL);
+ fsysltdl = !(dctx->cctx->drvflags & SLBT_DRIVER_PREFER_SLTDL);
/* source files */
if (slbt_snprintf(
@@ -109,7 +109,7 @@ static int slbt_exec_stoolie_perform_actions(
if (slbt_snprintf(
sltdl,sizeof(sltdl),"%s/%s",
SLBT_PACKAGE_DATADIR,
- fsltdl ? "sltdl.m4" : "sysltdl.m4") < 0)
+ "sltdl.m4") < 0)
return SLBT_BUFFER_ERROR(dctx);
if (slbt_snprintf(
@@ -134,6 +134,10 @@ static int slbt_exec_stoolie_perform_actions(
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);
@@ -174,15 +178,19 @@ static int slbt_exec_stoolie_perform_actions(
return SLBT_SYSTEM_ERROR(dctx,0);
if (slbt_snprintf(
- m4ltdl,sizeof(m4ltdl),"%s/%s",
- m4dir,"sltdl.m4") < 0)
+ 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,m4ltdl) < 0)
+ 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) {
@@ -213,6 +221,15 @@ static int slbt_exec_stoolie_perform_actions(
"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) {
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-05 00:55:31 +0000