diff options
author | tron <tron> | 2014-11-23 13:29:31 +0000 |
---|---|---|
committer | tron <tron> | 2014-11-23 13:29:31 +0000 |
commit | 1237b379ed7e9a97d6c82ddd2abd15dd51563ceb (patch) | |
tree | 6f6214ba8b1af6ab7cd3e6c59f2924befb0e2ab1 | |
parent | bbed7ddf0e61bdf90a1f382c55b5b8dcea83b8d2 (diff) | |
download | pkgsrc-1237b379ed7e9a97d6c82ddd2abd15dd51563ceb.tar.gz |
Pullup ticket #4553 - requested by dholland
shells/bash: build fix
Revisions pulled up:
- shells/bash/distinfo 1.39
- shells/bash/patches/patch-configure 1.1
---
Module Name: pkgsrc
Committed By: dholland
Date: Sun Nov 23 00:43:57 UTC 2014
Modified Files:
pkgsrc/shells/bash: distinfo
Added Files:
pkgsrc/shells/bash/patches: patch-configure
Log Message:
Use -Wl,-R instead of just -R to avoid breaking the build on FreeBSD.
>From Dennis Lindroos in PR 49375.
-rw-r--r-- | shells/bash/distinfo | 3 | ||||
-rw-r--r-- | shells/bash/patches/patch-configure | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 57af8899a1b..fa397705f43 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35.2.3 2014/10/07 08:46:57 tron Exp $ +$NetBSD: distinfo,v 1.35.2.4 2014/11/23 13:29:31 tron Exp $ SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845 @@ -97,6 +97,7 @@ SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb +SHA1 (patch-configure) = ae72a864325761bfbdde85761fd849e49968dff0 SHA1 (patch-lib_readline_colors.c) = f2f47e7aa0b5c1e999368109de10f80e39fd4438 SHA1 (patch-shell.c) = 08e55c3fa57a9e8eb6366c4eba91aa70f487acb2 SHA1 (patch-variables.c) = 55472b2c79451cd1bc7bd4bf097c9b697f95f521 diff --git a/shells/bash/patches/patch-configure b/shells/bash/patches/patch-configure new file mode 100644 index 00000000000..bca719ac9b0 --- /dev/null +++ b/shells/bash/patches/patch-configure @@ -0,0 +1,16 @@ +$NetBSD: patch-configure,v 1.1.2.2 2014/11/23 13:29:31 tron Exp $ + +Use -Wl,-R instead of just -R to avoid breaking the build on FreeBSD. +From Dennis Lindroos in PR 49375. + +--- configure~ 2014-02-11 15:38:00.000000000 +0000 ++++ configure +@@ -8837,7 +8837,7 @@ fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do +- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" ++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-Wl,-R$found_dir" + done + fi + |