Apply patch: ncpfs-2.2.6-makefile-fix-soname-link.patch

This commit is contained in:
Mario Fetka
2026-04-28 21:02:54 +02:00
parent 333460aa93
commit e1ee3915bb
3 changed files with 17 additions and 113 deletions

View File

@@ -0,0 +1,15 @@
diff -Naurp ncpfs-2.2.6.orig/lib/Makefile.in ncpfs-2.2.6/lib/Makefile.in
--- a/lib/Makefile.in.orig 2014-08-12 23:23:27.149141996 -0400
+++ b/lib/Makefile.in 2014-08-12 23:23:55.969141824 -0400
@@ -99,9 +99,10 @@ distclean: mrproper
install_shared: $(SHARED_NCPLIB_BIN)
$(INSTALL) -d $(DESTDIR)$(libsodir)
$(INSTALL) $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)
+ ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
+ ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB_SONAME)
install-dev: install_shared install_static
- ln -sf $(SHARED_NCPLIB_SONAME) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
$(INSTALL) -d $(DESTDIR)$(includedir)/ncp
$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/ext
$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/kernel

View File

@@ -105,10 +105,10 @@ distclean: mrproper
install_shared: $(SHARED_NCPLIB_BIN)
$(INSTALL) -d $(DESTDIR)$(libsodir)
$(INSTALL) $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)
-ldconfig
ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
ln -sf $(SHARED_NCPLIB_BIN) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB_SONAME)
install-dev: install_shared install_static
ln -sf $(SHARED_NCPLIB_SONAME) $(DESTDIR)$(libsodir)/$(SHARED_NCPLIB)
$(INSTALL) -d $(DESTDIR)$(includedir)/ncp
$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/ext
$(INSTALL) -d $(DESTDIR)$(includedir)/ncp/kernel

View File

@@ -1,111 +0,0 @@
#
# Makefile for the linux ncp-filesystem routines.
#
top_srcdir = @top_srcdir@
top_builddir = ..
this_srcdir = ${top_srcdir}/sutil
include ${top_builddir}/Make.rules
vpath %.c ${this_srcdir}
USE_KERNEL = @USE_KERNEL@
NDS_SUPPORT = @NDS_SUPPORT@
LIBS = @INTLLIBS@ @LIBICONV@ @LIBS@
# environ in ncpmount
CCFLAGS += -D_GNU_SOURCE
PIE_CFLAGS = -fpie
PIE_LDFLAGS = -pie
O_UTILS := nwsfind.o
ifeq ($(USE_KERNEL),1)
O_UTILS += ncpmount.o ncpumount.o
ifeq ($(NDS_SUPPORT),1)
O_UTILS += ncplogin.o
endif
endif
UTILS := $(O_UTILS:%.o=%)
ifeq ($(USE_KERNEL),1)
ifeq ($(NDS_SUPPORT),1)
UTILS += ncpmap
endif
endif
CFLAGS_ncpmount.o = -DNCPMOUNT=1 -DMAKE_NCPLIB
CFLAGS_ncpmap.o = -DNCPMAP=1 -DMAKE_NCPLIB
CFLAGS_ncplogin.o = -DMAKE_NCPLIB
CFLAGS_ncpm_common.o = -DNWMSG=\"$(sbindir)/nwmsg\"
.PHONY : all install install-dev dep clean mrproper distclean
.PHONY : default
default:
make -C ..
all: $(UTILS)
install: all
${INSTALL} -d $(DESTDIR)$(bindir)
${INSTALL} -d $(DESTDIR)/sbin
${INSTALL} -m 4755 $(UTILS) $(DESTDIR)$(bindir)
ifeq ($(USE_KERNEL),1)
ln -sf ..$(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncp
ln -sf ..$(bindir)/ncpmount $(DESTDIR)/sbin/mount.ncpfs
ln -sf ncpumount $(DESTDIR)$(bindir)/ncplogout
endif
install-dev:
$(O_UTILS): %.o: %.c
$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $<
$(O_UTILS:.o=.d): %.d: %.c
set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
| sed 's,\($*\)\.o[ :]*,\1.o \1.do \1.to $@ : ,g' > $@; \
[ -s $@ ] || rm -f $@
ncpmount: ncpm_common.o mount_login.o
ncplogin: ncpm_common.o mount_login.o
ncpmap: ncpm_common.o
ncpmap.o: %.o: ncplogin.c
$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $<
ncpmap.d: %.d: ncplogin.c
set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
| sed 's,\($*\)\.o[ :]*,\1.o \1.do \1.to $@ : ,g' > $@; \
[ -s $@ ] || rm -f $@
ncpm_common.o mount_login.o: %.o: %.c
$(CC) $(CFLAGS) $(CCFLAGS) $(CFLAGS_$@) $(PIE_CFLAGS) -o $@ -c $<
ncpm_common.d mount_login.d: %.d: %.c
set -e; $(CC) -M $(CFLAGS) $(CCFLAGS) $(CFLAGS_$(@:.d=.o)) $< \
| sed 's,\($*\)\.o[ :]*,\1.o \1.do \1.to $@ : ,g' > $@; \
[ -s $@ ] || rm -f $@
$(UTILS): %: %.o ../lib/libncp.$(libext)
$(CC) @GC_SECTIONS@-o $@ $^ $(PIE_LDFLAGS) ${LIBS}
../lib/libncp.$(libext):
make -C ../lib libncp.$(libext)
dep:
clean:
rm -f *.o *~ core $(UTILS)
mrproper: clean
rm -f *.d
distclean: mrproper
ifeq ($(NEED_DEP),yes)
include $(UTILS:%=%.d)
include ncpm_common.d
endif