diff --git a/.patches/ncpfs-2.2.6-r6/ncpfs-2.2.6-r6-ldflags-support.patch b/.patches/ncpfs-2.2.6-r6/ncpfs-2.2.6-r6-ldflags-support.patch new file mode 100644 index 0000000..0308440 --- /dev/null +++ b/.patches/ncpfs-2.2.6-r6/ncpfs-2.2.6-r6-ldflags-support.patch @@ -0,0 +1,153 @@ +diff '--color=auto' -uNr ncpfs-2.2.6.orig/contrib/pam/Makefile.in ncpfs-2.2.6/contrib/pam/Makefile.in +--- ncpfs-2.2.6.orig/contrib/pam/Makefile.in 2026-04-20 08:53:18.696719714 +0200 ++++ ncpfs-2.2.6/contrib/pam/Makefile.in 2026-04-20 08:53:35.912413754 +0200 +@@ -17,6 +17,7 @@ + PAM_OBJECTS = pam_ncp_auth.do support.do + + CFLAGS_pam_ncp_auth.do := -DNCPMOUNT_PATH=\"$(bindir)/ncpmount\" -DNCPUMOUNT_PATH=\"$(bindir)/ncpumount\" ++LDFLAGS = @LDFLAGS@ + + .PHONY : all install install-dev dep clean mrproper distclean + .PHONY : default +@@ -45,7 +46,7 @@ + + + $(PAM_LIBRARY): $(PAM_OBJECTS) +- $(CC) $(CFLAGS) -shared -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS} ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS} + + dep: + +diff '--color=auto' -uNr ncpfs-2.2.6.orig/ipx-1.0/Makefile.in ncpfs-2.2.6/ipx-1.0/Makefile.in +--- ncpfs-2.2.6.orig/ipx-1.0/Makefile.in 2026-04-20 08:53:18.706476360 +0200 ++++ ncpfs-2.2.6/ipx-1.0/Makefile.in 2026-04-20 08:53:35.912536606 +0200 +@@ -9,6 +9,7 @@ + vpath %.8 ${this_srcdir} + + LIBS = @INTLLIBS@ @LIBS@ ++LDFLAGS = @LDFLAGS@ + + O_UTILS = ipx_configure.o ipx_cmd.o + O_UTIIPX = ipx_interface.o ipx_internal_net.o ipx_route.o +@@ -33,7 +34,7 @@ + [ -s $@ ] || rm -f $@ + + $(UTIIPX): %: %.o ipxutil.o +- $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS} + + $(UTILS): %: %.o + $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ${LIBS} +diff '--color=auto' -uNr ncpfs-2.2.6.orig/ipxdump/Makefile.in ncpfs-2.2.6/ipxdump/Makefile.in +--- ncpfs-2.2.6.orig/ipxdump/Makefile.in 2026-04-20 08:53:18.707193602 +0200 ++++ ncpfs-2.2.6/ipxdump/Makefile.in 2026-04-20 08:53:35.912613993 +0200 +@@ -11,6 +11,7 @@ + OBJECTS= ipxutil.o + + ALL_OBJECTS := $(EXEC:%=%.o) $(OBJECTS) ++LDFLAGS = @LDFLAGS@ + + .PHONY : all install dep clean mrproper distclean + .PHONY : dist tgz +@@ -24,7 +25,7 @@ + ifeq ($(ncp_if_ether_support),yes) + + $(EXEC): %: %.o $(OBJECTS) +- $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS) + + else + .PHONY ipxdump ipxparse +diff '--color=auto' -uNr ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in +--- ncpfs-2.2.6.orig/lib/Makefile.in 2026-04-20 08:53:18.705915997 +0200 ++++ ncpfs-2.2.6/lib/Makefile.in 2026-04-20 08:53:35.912711256 +0200 +@@ -24,6 +24,7 @@ + PIE_FLAGS := -fpie + PIC_FLAGS := -fPIC + NWCOMPAT := 1 ++LDFLAGS := @LDFLAGS@ + + SHARED_VLINK := + SHARED_VLINK_CFLAGS := +@@ -128,7 +129,7 @@ + ln -sf $< $@ + + $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers +- $(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} ++ $(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(LDFLAGS) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} + + install_static: $(STATIC_NCPLIB_BIN) + $(INSTALL) -d $(DESTDIR)$(libadir) +diff '--color=auto' -uNr ncpfs-2.2.6.orig/Make.rules.in ncpfs-2.2.6/Make.rules.in +--- ncpfs-2.2.6.orig/Make.rules.in 2026-04-20 08:53:18.707387153 +0200 ++++ ncpfs-2.2.6/Make.rules.in 2026-04-20 08:53:35.912827011 +0200 +@@ -43,6 +43,7 @@ + CFLAGS_DEFINES := -DN_PLAT_LINUX -DLOCALEDIR=\"${localedir}\" -DNCPFS_VERSION=\"${VERSION}\" -DNCPFS_PACKAGE=\"${PACKAGE}\" + + CCFLAGS := $(CFLAGS_DEFINES) $(CFLAGS_OPTIONS) $(INCLUDES) ++LDFLAGS := @LDFLAGS@ + + # If your system is ELF, either also do a 'make install', or append the util/ + # directory where the dynamic library resides to the environment +diff '--color=auto' -uNr ncpfs-2.2.6.orig/sutil/Makefile.in ncpfs-2.2.6/sutil/Makefile.in +--- ncpfs-2.2.6.orig/sutil/Makefile.in 2026-04-20 08:53:18.703038614 +0200 ++++ ncpfs-2.2.6/sutil/Makefile.in 2026-04-20 08:56:37.504553558 +0200 +@@ -14,6 +14,7 @@ + NDS_SUPPORT = @NDS_SUPPORT@ + + LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ ++LDFLAGS := @LDFLAGS@ + + # environ in ncpmount + CCFLAGS += -D_GNU_SOURCE +@@ -73,7 +74,7 @@ + ncpmap: ncpm_common.o + + ncpmap.o: %.o: ncplogin.c +- $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $< ++ $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $< + + ncpmap.d: %.d: ncplogin.c + set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ +@@ -89,7 +90,7 @@ + [ -s $@ ] || rm -f $@ + + $(UTILS): %: %.o ../lib/libncp.$(libext) +- $(CC) @GC_SECTIONS@-o $@ $^ $(PIE_LDFLAGS) ${LIBS} ++ $(CC) @GC_SECTIONS@-o $@ $^ $(LDFLAGS) $(PIE_LDFLAGS) ${LIBS} + + ../lib/libncp.$(libext): + make -C ../lib libncp.$(libext) +diff '--color=auto' -uNr ncpfs-2.2.6.orig/util/Makefile.in ncpfs-2.2.6/util/Makefile.in +--- ncpfs-2.2.6.orig/util/Makefile.in 2026-04-20 08:53:18.695846760 +0200 ++++ ncpfs-2.2.6/util/Makefile.in 2026-04-20 08:57:24.020465257 +0200 +@@ -15,6 +15,7 @@ + MOUNT2 = @MOUNT2@ + + LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ ++LDFLAGS = @LDFLAGS@ + + O_OTHER = dsqueue.o + O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \ +@@ -81,7 +82,7 @@ + make -C $(NCPLIB_DIR) libncp.$(shlibext) + + $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c +- $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< ++ $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< + + %.d: %.c + set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ +@@ -92,10 +93,10 @@ + pqstat nwpqjob nprint: dsqueue.o + + $(UTILS): %: %.o $(LIBDEP) +- $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS} ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS} + + ipx_probe: ipx_probe.c +- $(CC) $(CFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS} ++ $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS} + + dep: + diff --git a/Make.rules.in b/Make.rules.in index 84639b2..6b8bd61 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -43,6 +43,7 @@ CFLAGS_OPTIONS += $(CWARN) CFLAGS_DEFINES := -DN_PLAT_LINUX -DLOCALEDIR=\"${localedir}\" -DNCPFS_VERSION=\"${VERSION}\" -DNCPFS_PACKAGE=\"${PACKAGE}\" CCFLAGS := $(CFLAGS_DEFINES) $(CFLAGS_OPTIONS) $(INCLUDES) +LDFLAGS := @LDFLAGS@ # If your system is ELF, either also do a 'make install', or append the util/ # directory where the dynamic library resides to the environment diff --git a/contrib/pam/Makefile.in b/contrib/pam/Makefile.in index 1d3e966..1e3a0c1 100644 --- a/contrib/pam/Makefile.in +++ b/contrib/pam/Makefile.in @@ -17,6 +17,7 @@ PAM_LIBRARY = pam_ncp_auth.$(shlibext) PAM_OBJECTS = pam_ncp_auth.do support.do CFLAGS_pam_ncp_auth.do := -DNCPMOUNT_PATH=\"$(bindir)/ncpmount\" -DNCPUMOUNT_PATH=\"$(bindir)/ncpumount\" +LDFLAGS = @LDFLAGS@ .PHONY : all install install-dev dep clean mrproper distclean .PHONY : default @@ -45,7 +46,7 @@ $(PAM_OBJECTS): %.do: %.c $(PAM_LIBRARY): $(PAM_OBJECTS) - $(CC) $(CFLAGS) -shared -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS} + $(CC) $(CFLAGS) -shared $(LDFLAGS) -o $@ $(PAM_OBJECTS) -L$(NCPLIB_DIR) -lncp -lpam ${LIBS} dep: diff --git a/ipx-1.0/Makefile.in b/ipx-1.0/Makefile.in index fa5ad4f..316c56e 100644 --- a/ipx-1.0/Makefile.in +++ b/ipx-1.0/Makefile.in @@ -9,6 +9,7 @@ vpath %.c ${this_srcdir} vpath %.8 ${this_srcdir} LIBS = @INTLLIBS@ @LIBS@ +LDFLAGS = @LDFLAGS@ O_UTILS = ipx_configure.o ipx_cmd.o O_UTIIPX = ipx_interface.o ipx_internal_net.o ipx_route.o @@ -33,7 +34,7 @@ $(ALL_OBJECTS): %.o: %.c [ -s $@ ] || rm -f $@ $(UTIIPX): %: %.o ipxutil.o - $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS} + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) ipxutil.o ${LIBS} $(UTILS): %: %.o $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) ${LIBS} diff --git a/ipxdump/Makefile.in b/ipxdump/Makefile.in index 75582af..dffb4ce 100644 --- a/ipxdump/Makefile.in +++ b/ipxdump/Makefile.in @@ -11,6 +11,7 @@ ncp_if_ether_support = @ncp_if_ether_support@ OBJECTS= ipxutil.o ALL_OBJECTS := $(EXEC:%=%.o) $(OBJECTS) +LDFLAGS = @LDFLAGS@ .PHONY : all install dep clean mrproper distclean .PHONY : dist tgz @@ -24,7 +25,7 @@ install: $(EXEC) ifeq ($(ncp_if_ether_support),yes) $(EXEC): %: %.o $(OBJECTS) - $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(OBJECTS) else .PHONY ipxdump ipxparse diff --git a/lib/Makefile.in b/lib/Makefile.in index e69bb2e..b85d604 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -24,6 +24,7 @@ CCFLAGS += -I. PIE_FLAGS := -fpie PIC_FLAGS := -fPIC NWCOMPAT := 1 +LDFLAGS := @LDFLAGS@ SHARED_VLINK := SHARED_VLINK_CFLAGS := @@ -128,7 +129,7 @@ $(SHARED_NCPLIB): $(SHARED_NCPLIB_BIN) ln -sf $< $@ $(SHARED_NCPLIB_BIN): $(SHARED_O_OBJ) ${this_srcdir}/libncp.vers - $(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} + $(CC) -shared -o $@ -Wl,-soname=$(SHARED_NCPLIB_SONAME) $(LDFLAGS) $(SHARED_VLINK) $(SHARED_O_OBJ) ${LIBS} install_static: $(STATIC_NCPLIB_BIN) $(INSTALL) -d $(DESTDIR)$(libadir) diff --git a/sutil/Makefile.in b/sutil/Makefile.in index ceeecd3..eabd0bb 100644 --- a/sutil/Makefile.in +++ b/sutil/Makefile.in @@ -14,6 +14,7 @@ USE_KERNEL = @USE_KERNEL@ NDS_SUPPORT = @NDS_SUPPORT@ LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ +LDFLAGS := @LDFLAGS@ # environ in ncpmount CCFLAGS += -D_GNU_SOURCE @@ -73,7 +74,7 @@ ncplogin: ncpm_common.o mount_login.o ncpmap: ncpm_common.o ncpmap.o: %.o: ncplogin.c - $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $< + $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $< ncpmap.d: %.d: ncplogin.c set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ @@ -89,7 +90,7 @@ ncpm_common.d mount_login.d: %.d: %.c [ -s $@ ] || rm -f $@ $(UTILS): %: %.o ../lib/libncp.$(libext) - $(CC) @GC_SECTIONS@-o $@ $^ $(PIE_LDFLAGS) ${LIBS} + $(CC) @GC_SECTIONS@-o $@ $^ $(LDFLAGS) $(PIE_LDFLAGS) ${LIBS} ../lib/libncp.$(libext): make -C ../lib libncp.$(libext) diff --git a/util/Makefile.in b/util/Makefile.in index 05a8a48..b03e838 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -15,6 +15,7 @@ NDS_SUPPORT = @NDS_SUPPORT@ MOUNT2 = @MOUNT2@ LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@ +LDFLAGS = @LDFLAGS@ O_OTHER = dsqueue.o O_USERUTILS = slist.o pqlist.o nwfsinfo.o pserver.o nprint.o nsend.o \ @@ -81,7 +82,7 @@ install-dev: make -C $(NCPLIB_DIR) libncp.$(shlibext) $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c - $(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< + $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) $(CFLAGS_$@) -o $@ -c $< %.d: %.c set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \ @@ -92,10 +93,10 @@ $(O_USERUTILS) $(O_SBINUTILS) $(O_OTHER) ncptest.o: %.o: %.c pqstat nwpqjob nprint: dsqueue.o $(UTILS): %: %.o $(LIBDEP) - $(CC) $(CFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS} + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(addsuffix .o,$@) $(ADDOBJS_$@) -L$(NCPLIB_DIR) -lncp ${LIBS} ipx_probe: ipx_probe.c - $(CC) $(CFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS} + $(CC) $(CFLAGS) $(LDFLAGS) $(CCFLAGS) -o ipx_probe ipx_probe.c ${LIBS} dep: