diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2019-02-21 09:32:08 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2019-02-21 09:32:08 +0000 |
| commit | aa878105d8f300c8bc742cac38b8eba40b3af567 (patch) | |
| tree | f3cb57439cc69b76ca936b6b3a4c4095e6d4b5db /shells/bash | |
| parent | 6c2d9cbf940267ff44d4d91e838eca32136dabaf (diff) | |
| download | ports-aa878105d8f300c8bc742cac38b8eba40b3af567.tar.gz ports-aa878105d8f300c8bc742cac38b8eba40b3af567.zip | |
Do not attempt to build 'loadables' in the install target when the static build
option is selected.
Loadables will not build statically. The upstream makefile handles this by
ignoring a non-zero exit status by prefixing the build instruction with a minus.
Nevertheless this causes plenty of confusion among our user base.
No PORTREVISION bump as this is a NOOP.
Notes
Notes:
svn path=/head/; revision=493497
Diffstat (limited to 'shells/bash')
| -rw-r--r-- | shells/bash/files/patch-Makefile.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/shells/bash/files/patch-Makefile.in b/shells/bash/files/patch-Makefile.in new file mode 100644 index 000000000000..ca7dcf193f02 --- /dev/null +++ b/shells/bash/files/patch-Makefile.in @@ -0,0 +1,12 @@ +--- Makefile.in.orig 2018-05-25 12:47:09 UTC ++++ Makefile.in +@@ -824,7 +824,9 @@ install: .made installdirs + infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ ) + -( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ ) + -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ ) ++.if !$(STATIC_LD:M-static) + -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ ) ++.endif + + install-strip: + $(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \ |