diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-07-22 22:09:56 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-07-23 08:59:47 +0200 |
commit | bcec1638cf64c4ac465f27e434435f983aa1b1cf (patch) | |
tree | c0bfc0874f19ec65a2f08ecb3a4bc72c3f33a62e /source/l/netpbm/netpbm-libdir-so.patch | |
parent | 9f4ecf6a5f87f2f8eb2401c45d1dff7ca806bba5 (diff) | |
download | current-bcec1638cf64c4ac465f27e434435f983aa1b1cf.tar.gz |
Mon Jul 22 22:09:56 UTC 201920190722220956
a/aaa_terminfo-6.1_20190720-x86_64-1.txz: Upgraded.
ap/squashfs-tools-20190721_95230e2-x86_64-1.txz: Upgraded.
l/ncurses-6.1_20190720-x86_64-1.txz: Upgraded.
l/netpbm-10.87.00-x86_64-1.txz: Upgraded.
n/net-tools-20181103_0eebece-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/netpbm/netpbm-libdir-so.patch')
-rw-r--r-- | source/l/netpbm/netpbm-libdir-so.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/source/l/netpbm/netpbm-libdir-so.patch b/source/l/netpbm/netpbm-libdir-so.patch new file mode 100644 index 00000000..558daae1 --- /dev/null +++ b/source/l/netpbm/netpbm-libdir-so.patch @@ -0,0 +1,48 @@ +diff --git a/lib/Makefile b/lib/Makefile +index bc758df..7f51b41 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -221,7 +221,7 @@ libpm.o: compile.h + .PHONY: install.lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install a Unix-style shared library +-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink ++install.lib: $(PKGDIR)/lib + cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).* + $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \ + libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/ +@@ -263,27 +263,26 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(PKGDIR)/include/netpbm + $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/ + + .PHONY: install.staticlib +-install.staticlib: $(PKGDIR)/staticlink ++install.staticlib: $(PKGDIR)/lib + $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \ +- $(PKGDIR)/staticlink ++ $(PKGDIR)/lib + + # Install a shared library stub -- the ".so" file used at link time to + # prepare a program for dynamically linking a library at run time + .PHONY: install.sharedlibstub +-install.sharedlibstub: $(PKGDIR)/sharedlink ++install.sharedlibstub: $(PKGDIR)/lib + ifeq ($(NETPBMLIBTYPE),unixshared) + # install the link-time (.so) links to the runtime libraries +- cd $(PKGDIR)/sharedlink ; \ ++ cd $(PKGDIR)/lib ; \ + rm -f libnetpbm.$(NETPBMLIBSUFFIX); \ +- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ ++ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \ + libnetpbm.$(NETPBMLIBSUFFIX) + endif + ifeq ($(NETPBMLIBTYPE),dll) +- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \ +- $(PKGDIR)/sharedlink ++ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/link + endif + ifeq ($(NETPBMLIBTYPE),dylib) +- cd $(PKGDIR)/sharedlink/ ; \ ++ cd $(PKGDIR)/link/ ; \ + rm -f libnetpbm.dylib; \ + $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib + endif |