diff --git a/m4/sltdl.m4 b/m4/sltdl.m4 index 4d15333..d8e394f 100644 --- a/m4/sltdl.m4 +++ b/m4/sltdl.m4 @@ -35,5 +35,5 @@ AC_BEFORE([$0],[_SLIBTOOL_ARGUMENT_HANDLING]) # slibtool: sltdl option # --------------------------------- -slibtool_prefer_sltdl='yes' +slibtool_prefer_sltdl=${slibtool_prefer_sltdl:-yes} ]) diff --git a/m4/sysltdl.m4 b/m4/sysltdl.m4 deleted file mode 100644 index baeb847..0000000 --- a/m4/sysltdl.m4 +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################### -# # -# sysltdl.m4: system libltdl integration for autoconf-based projects # -# # -# Copyright (C) 2016--2025 SysDeer Technologies, LLC # -# # -# Permission is hereby granted, free of charge, to any person obtaining # -# a copy of this software and associated documentation files (the # -# "Software"), to deal in the Software without restriction, including # -# without limitation the rights to use, copy, modify, merge, publish, # -# distribute, sublicense, and/or sell copies of the Software, and to # -# permit persons to whom the Software is furnished to do so, subject to # -# the following conditions: # -# # -# The above copyright notice and this permission notice shall be included # -# in all copies or substantial portions of the Software. # -# # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS # -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF # -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. # -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY # -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, # -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # -# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -# # -############################################################################### - - - -# __SLIBTOOL_SLTDL_OPTION -# ------------------ -AC_DEFUN([_SLIBTOOL_SLTDL_OPTION],[ -AC_BEFORE([$0],[SLIBTOOL_INIT]) -AC_BEFORE([$0],[_SLIBTOOL_ARGUMENT_HANDLING]) - -# slibtool: sltdl option -# --------------------------------- -slibtool_prefer_sltdl='no' -]) diff --git a/project/extras.mk b/project/extras.mk index 2679189..1a7c872 100644 --- a/project/extras.mk +++ b/project/extras.mk @@ -107,7 +107,6 @@ install-slibtoolize: mkdir -p $(DESTDIR)$(DATADIR)/$(PACKAGE) cp -p $(SOURCE_DIR)/m4/slibtool.m4 $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/m4/sysltdl.m4 $(DESTDIR)$(DATADIR)/$(PACKAGE) cp -p $(SOURCE_DIR)/m4/sltdl.m4 $(DESTDIR)$(DATADIR)/$(PACKAGE) cp -p $(SOURCE_DIR)/aux/ltmain.sh $(DESTDIR)$(DATADIR)/$(PACKAGE) cp -p $(SOURCE_DIR)/aux/slibtool.sh $(DESTDIR)$(DATADIR)/$(PACKAGE) diff --git a/src/logic/slbt_exec_stoolie.c b/src/logic/slbt_exec_stoolie.c index 84d8b23..d8cd9c0 100644 --- a/src/logic/slbt_exec_stoolie.c +++ b/src/logic/slbt_exec_stoolie.c @@ -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/skin/slbt_skin_stoolie.c b/src/skin/slbt_skin_stoolie.c index 3140d22..39117c5 100644 --- a/src/skin/slbt_skin_stoolie.c +++ b/src/skin/slbt_skin_stoolie.c @@ -55,9 +55,14 @@ const slbt_hidden struct argv_option slbt_stoolie_options[] = { "deferring -lltdl to the system installed library."}, {"system-ltdl",0,TAG_STLE_SYSTEM_LTDL,ARGV_OPTARG_NONE,0,0,0, - "Do not enforce the use of libsltdl. " - "Without this option, --prefer-sltdl will be added to " - "slibtool's configured arguments."}, + "Create the empty tag file (or symlink) sysltdl.tag; " + "presence of this tag file shall stand for " + "the preference to link against the system-installed " + "ltdl library, and package builder wishing to respect " + "this preference should set the shell variable " + "slibtool_prefer_sltdl to 'no' prior to invoking " + "the package's ./configure script."}, + {0,0,0,0,0,0,0,0} };