mirror of
https://git.freebsd.org/ports.git
synced 2025-06-03 11:56:28 -04:00
Default path includes the string %%LOCALBASE%%. This was intended to be replaced
with the real value of LOCALBASE by the port Makefile at some point, but it isn't at the moment. Set this value in the Makefile by defining CPPFLAGS accordingly. PR: 217451 Submitted by: Dan McGregor <dan.mcgregor@usask.ca> MFH: 2017Q1 (blanket)
This commit is contained in:
parent
cbbe2f203b
commit
4cb2ee99e3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=435164
2 changed files with 5 additions and 15 deletions
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= bash
|
||||
PATCHLEVEL= 12
|
||||
PORTVERSION= 4.4.${PATCHLEVEL:S/^0//g}
|
||||
PORTREVISION?= 0
|
||||
PORTREVISION?= 1
|
||||
CATEGORIES= shells
|
||||
MASTER_SITES= GNU/${PORTNAME}
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
|
||||
|
@ -65,6 +65,9 @@ CONFIGURE_ARGS+= --disable-static-link
|
|||
# "enable -f". (Plugins are not supported for bash-static.)
|
||||
CFLAGS+= -Wl,-export-dynamic
|
||||
.endif
|
||||
STANDARD_PATH= /sbin:/bin:/usr/sbin:/usr/bin
|
||||
CPPFLAGS+= -DDEFAULT_PATH_VALUE='\"${STANDARD_PATH}:${LOCALBASE}/sbin:${LOCALBASE}/bin\"' \
|
||||
-DSTANDARD_UTILS_PATH='\"${STANDARD_PATH}\"'
|
||||
|
||||
post-patch:
|
||||
# Ensure y.tab.c is regenerated
|
||||
|
|
|
@ -1,19 +1,6 @@
|
|||
--- config-top.h.orig 2016-05-19 18:34:02 UTC
|
||||
+++ config-top.h
|
||||
@@ -63,18 +63,18 @@
|
||||
/* The default value of the PATH variable. */
|
||||
#ifndef DEFAULT_PATH_VALUE
|
||||
#define DEFAULT_PATH_VALUE \
|
||||
- "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
|
||||
+ "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin"
|
||||
#endif
|
||||
|
||||
/* The value for PATH when invoking `command -p'. This is only used when
|
||||
the Posix.2 confstr () function, or CS_PATH define are not present. */
|
||||
#ifndef STANDARD_UTILS_PATH
|
||||
#define STANDARD_UTILS_PATH \
|
||||
- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
|
||||
+ "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games"
|
||||
@@ -74,7 +74,7 @@
|
||||
#endif
|
||||
|
||||
/* Default primary and secondary prompt strings. */
|
||||
|
|
Loading…
Add table
Reference in a new issue