Attachment 188083 Details for Bug 223724 – Move the local build directory to the front of the linker's search path

[patch] Move the local build directory to the front of the linker's search path

netpbm.patch (text/plain), 1.72 KB, created by Mikhail T. on 2017-11-17 22:38:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2017-11-17 22:38:43 UTC

Size: 1.72 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 454386)
>+++ Makefile	(working copy)
>@@ -78,7 +78,6 @@
> X11_USE=		XORG=x11,xcb,xau,xdmcp
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|misc|share/netpbm|g' ${WRKSRC}/common.mk
> 	@${REINPLACE_CMD} -e 's|$$(PKGDIR)/link|$$(PKGDIR)/lib|g' \
> 		-e 's|pkg-config|false|g' \
> 		${WRKSRC}/GNUmakefile ${WRKSRC}/lib/Makefile
>Index: files/patch-common.mk
>===================================================================
>--- files/patch-common.mk	(nonexistent)
>+++ files/patch-common.mk	(working copy)
>@@ -0,0 +1,23 @@
>+--- common.mk	2017-09-30 20:37:42 UTC
>++++ common.mk	2017-11-17 22:30:08 UTC
>+@@ -382,5 +382,5 @@
>+ # after LDFLAGS_TARGET.
>+ LDFLAGS_ALL = $(WINICON_OBJECT) \
>+- $(LDFLAGS_TARGET) $(shell $(LIBOPT) $(NETPBMLIB)) \
>++ $(shell $(LIBOPT) $(NETPBMLIB)) $(LDFLAGS_TARGET) \
>+  $(LDFLAGS) $(LDLIBS) $(MATHLIB) $(RPATH) $(LADD)
>+ 
>+@@ -468,5 +468,5 @@
>+ PKGMANSUBDIRS = man1 man3 man5 web
>+ 
>+-PKGSUBDIRS = bin include include/netpbm lib link misc \
>++PKGSUBDIRS = bin include include/netpbm lib link share/netpbm \
>+   $(PKGMANSUBDIRS:%=$(PKGMANDIR)/%)
>+ 
>+@@ -502,5 +502,5 @@
>+ 
>+ .PHONY: $(DATAFILES:%=%_installdata) 
>+-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
>++$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm
>+ 	$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
>+ 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
>
>Property changes on: files/patch-common.mk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

freebsd-2024: maintainer-approval?

Actions: View | Diff

Attachments on bug 223724: 188083 | 188084