In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/84b55e0b165b377f31340b41bd7b3e71a6d3ba23?hp=b2d46802c50a25511c0e9331f13a8312c6e5e60b>
- Log ----------------------------------------------------------------- commit 84b55e0b165b377f31340b41bd7b3e71a6d3ba23 Author: H.Merijn Brand - Tux <[email protected]> Date: Sun Nov 13 15:55:09 2016 +0100 Assume dist-git will merge our PR's ----------------------------------------------------------------------- Summary of changes: dist/U/cf_who.U | 11 +++++++---- dist/U/d_msg.U | 21 ++++++++++++++++++++- dist/U/d_sem.U | 19 ++++++++++++++++++- dist/U/issymlink.U | 3 ++- 4 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dist/U/cf_who.U b/dist/U/cf_who.U index d89b1d4..d7492c7 100644 --- a/dist/U/cf_who.U +++ b/dist/U/cf_who.U @@ -47,16 +47,19 @@ cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` ?X: cf_by=`( (logname) 2>/dev/null || whoami) 2>&1` ?X: Switch to emergency mode... -- RAM, 19/04/94 ?X: -?X: Parens needed to avoid error message if the program does not exist. +?X: Parentheses needed to avoid error message if the program does not exist. ?X: Uses case instead of $test so it can be put before $test is defined. ?X: Don't redirect to a file because on Ultrix (under script?) logname ?X: outputs a blank line first. This method will apparently work. -cf_by=`(logname) 2>/dev/null` case "$cf_by" in "") - cf_by=`(whoami) 2>/dev/null` + cf_by=`(logname) 2>/dev/null` case "$cf_by" in - "") cf_by=unknown ;; + "") + cf_by=`(whoami) 2>/dev/null` + case "$cf_by" in + "") cf_by=unknown ;; + esac ;; esac ;; esac diff --git a/dist/U/d_msg.U b/dist/U/d_msg.U index 478d856..748da6a 100644 --- a/dist/U/d_msg.U +++ b/dist/U/d_msg.U @@ -12,7 +12,7 @@ ?RCS: Revision 3.0 1993/08/18 12:06:37 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_msg: test d_msgctl d_msgget d_msgsnd d_msgrcv Setvar Findhdr +?MAKE:d_msg: test d_msgctl d_msgget d_msgsnd d_msgrcv Setvar Findhdr osname ?MAKE: -pick add $@ %< ?S:d_msg: ?S: This variable conditionally defines the HAS_MSG symbol, which @@ -32,6 +32,25 @@ echo " " case "$d_msgctl$d_msgget$d_msgsnd$d_msgrcv" in *"$undef"*) h_msg=false;; esac +case "$osname" in +freebsd) + case "`ipcs 2>&1`" in + "SVID messages"*"not configured"*) + echo "Your $osname does not have the msg*(2) configured." >&4 + h_msg=false + val="$undef" + set msgctl d_msgctl + eval $setvar + set msgget d_msgget + eval $setvar + set msgsnd d_msgsnd + eval $setvar + set msgrcv d_msgrcv + eval $setvar + ;; + esac + ;; +esac : we could also check for sys/ipc.h ... if $h_msg && $test `./findhdr sys/msg.h`; then echo "You have the full msg*(2) library." >&4 diff --git a/dist/U/d_sem.U b/dist/U/d_sem.U index 14690c2..d4c59aa 100644 --- a/dist/U/d_sem.U +++ b/dist/U/d_sem.U @@ -12,7 +12,7 @@ ?RCS: Revision 3.0 1993/08/18 12:07:03 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:d_sem: test d_semctl d_semget d_semop Setvar Findhdr +?MAKE:d_sem: test d_semctl d_semget d_semop Setvar Findhdr osname ?MAKE: -pick add $@ %< ?S:d_sem: ?S: This variable conditionally defines the HAS_SEM symbol, which @@ -32,6 +32,23 @@ echo " " case "$d_semctl$d_semget$d_semop" in *"$undef"*) h_sem=false;; esac +case "$osname" in +freebsd) + case "`ipcs 2>&1`" in + "SVID messages"*"not configured"*) + echo "Your $osname does not have the sem*(2) configured." >&4 + h_sem=false + val="$undef" + set semctl d_semctl + eval $setvar + set semget d_semget + eval $setvar + set semop d_semop + eval $setvar + ;; + esac + ;; +esac : we could also check for sys/ipc.h ... if $h_sem && $test `./findhdr sys/sem.h`; then echo "You have the full sem*(2) library." >&4 diff --git a/dist/U/issymlink.U b/dist/U/issymlink.U index cac0ad0..f1a159f 100644 --- a/dist/U/issymlink.U +++ b/dist/U/issymlink.U @@ -23,6 +23,7 @@ ?S:. ?T:pth p ?LINT:change PATH test +?LINT:extern newsh : determine whether symbolic links are supported echo " " case "$lns" in @@ -64,7 +65,7 @@ case "$lns" in ;; *) issymlink='' ;; esac - fi + fi fi if $test "X$issymlink" = X; then if $test -L sym 2>/dev/null; then -- perl5 metaconfig repository
