* PATCH: workaround for "config.status not found" on Cygwin
@ 2001-05-20 9:22 Andrej Borsenkow
2001-05-20 10:23 ` Andrej Borsenkow
0 siblings, 1 reply; 4+ messages in thread
From: Andrej Borsenkow @ 2001-05-20 9:22 UTC (permalink / raw)
To: ZSH Workers Mailing List
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
Cygwin can optionally use NTFS attributes to emulate Unix file permissions
(CYGWIN=...ntea...). In this case file on NTFS must have x bit to be
considered executable. There is something fishy still:
- writing to a file resets all x bits. That accounts for a chmod line in
configure.in (we change file after it was created). But
- it did not help (God knows why). ls -l at the very end of configure shows
config.status with x bits set and ls -l immediately after configure runs
shows no x bits. It smells very much like a Cygwin bug, but for now I just
changed mkmakemod.sh to use /bin/sh config.status.
-andrej
[-- Attachment #2: zsh.config.status.diff --]
[-- Type: application/octet-stream, Size: 1415 bytes --]
Index: configure.in
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.in,v
retrieving revision 1.57
diff -u -r1.57 configure.in
--- configure.in 2001/05/10 07:13:41 1.57
+++ configure.in 2001/05/20 09:13:53
@@ -1913,6 +1913,7 @@
cp $CONFIG_STATUS $CONFIG_STATUS.old
sed '1,$s@^\( *ac_file_inputs=\).*$@\1`echo $ac_file_in | sed -e "s%^%:%" -e "s%:\\([^!]\\)% $ac_given_srcdir/\\1%g" -e "s%:!% %"`@' \
$CONFIG_STATUS.old >$CONFIG_STATUS
+ chmod +x $CONFIG_STATUS
rm -f $CONFIG_STATUS.old]
test "$real_no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
Index: Src/mkmakemod.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/mkmakemod.sh,v
retrieving revision 1.10
diff -u -r1.10 mkmakemod.sh
--- Src/mkmakemod.sh 2001/04/23 19:59:04 1.10
+++ Src/mkmakemod.sh 2001/05/20 09:13:55
@@ -472,7 +472,7 @@
# tree, this is a problem. zsh's configure script edits config.status,
# adding the feature that an input filename starting with "!" has the
# "!" removed and is not mangled further.
- CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ./config.status
+ CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ${CONFIG_SHELL-/bin/sh} ./config.status
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: PATCH: workaround for "config.status not found" on Cygwin
2001-05-20 9:22 PATCH: workaround for "config.status not found" on Cygwin Andrej Borsenkow
@ 2001-05-20 10:23 ` Andrej Borsenkow
2001-05-28 21:43 ` Christopher Faylor
0 siblings, 1 reply; 4+ messages in thread
From: Andrej Borsenkow @ 2001-05-20 10:23 UTC (permalink / raw)
To: ZSH Workers Mailing List
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
>
> Cygwin can optionally use NTFS attributes to emulate Unix file permissions
> (CYGWIN=...ntea...). In this case file on NTFS must have x bit to be
> considered executable.
It is worse. I build off SAMBA drive and none file on the SAMBA is
considered executable in this case. It is O.K. if no ntea is set. So, this
patch extends (and replaces) the previous one by sticking $(SHELL) or
/bin/sh where possible.
-andrej
[-- Attachment #2: zsh.config.status.diff --]
[-- Type: application/octet-stream, Size: 7077 bytes --]
Index: Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- Makefile.in 2001/02/14 17:58:11 1.7
+++ Makefile.in 2001/05/20 10:11:19
@@ -79,7 +79,7 @@
install.fns:
if test x$(fndir) != x && test x$(fndir) != xno; then \
test x$(sitefndir) != xno && \
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(sitefndir); \
+ $(SHELL) $(sdir_top)/mkinstalldirs $(DESTDIR)$(sitefndir); \
sdir_top="$(sdir_top)" fndir="$(fndir)" dir_top="$(dir_top)" \
FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
INSTALL_DATA="$(INSTALL_DATA)" \
@@ -126,7 +126,7 @@
config: config.h
config.status: $(sdir)/configure
- ./config.status --recheck
+ $(SHELL) ./config.status --recheck
$(sdir)/configure: $(sdir)/configure.in $(sdir)/aclocal.m4 $(sdir)/aczsh.m4
cd $(sdir) && autoconf
@@ -134,7 +134,7 @@
config.h: stamp-h
stamp-h: $(sdir)/config.h.in config.status
cd $(dir_top) && \
- CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h ./config.status
+ CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h $(SHELL) ./config.status
$(sdir)/config.h.in: $(sdir)/stamp-h.in
$(sdir)/stamp-h.in: $(sdir)/configure.in $(sdir)/acconfig.h \
Index: configure.in
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.in,v
retrieving revision 1.57
diff -u -r1.57 configure.in
--- configure.in 2001/05/10 07:13:41 1.57
+++ configure.in 2001/05/20 10:11:20
@@ -1913,6 +1913,7 @@
cp $CONFIG_STATUS $CONFIG_STATUS.old
sed '1,$s@^\( *ac_file_inputs=\).*$@\1`echo $ac_file_in | sed -e "s%^%:%" -e "s%:\\([^!]\\)% $ac_given_srcdir/\\1%g" -e "s%:!% %"`@' \
$CONFIG_STATUS.old >$CONFIG_STATUS
+ chmod +x $CONFIG_STATUS
rm -f $CONFIG_STATUS.old]
test "$real_no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
Index: Config/config.mk
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/config.mk,v
retrieving revision 1.2
diff -u -r1.2 config.mk
--- Config/config.mk 2000/05/10 18:29:37 1.2
+++ Config/config.mk 2001/05/20 10:11:20
@@ -35,8 +35,8 @@
Makefile: Makefile.in $(dir_top)/config.status $(CONFIG_INCS)
cd $(dir_top) && \
- CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+ CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
$(dir_top)/Config/defs.mk: $(sdir_top)/Config/defs.mk.in $(dir_top)/config.status
cd $(dir_top) && \
- CONFIG_FILES=Config/defs.mk CONFIG_HEADERS= ./config.status
+ CONFIG_FILES=Config/defs.mk CONFIG_HEADERS= $(SHELL) ./config.status
Index: Config/installfns.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/installfns.sh,v
retrieving revision 1.7
diff -u -r1.7 installfns.sh
--- Config/installfns.sh 2001/04/02 16:49:25 1.7
+++ Config/installfns.sh 2001/05/20 10:11:20
@@ -2,7 +2,7 @@
fndir=$DESTDIR$fndir
-$sdir_top/mkinstalldirs $fndir || exit 1;
+/bin/sh $sdir_top/mkinstalldirs $fndir || exit 1;
allfuncs="`grep ' functions=.' ${dir_top}/config.modules |
sed -e '/^#/d' -e '/ link=no/d' -e 's/^.* functions=//'`"
@@ -32,7 +32,7 @@
else
instdir="$fndir"
fi
- test -d $instdir || $sdir_top/mkinstalldirs $instdir || exit 1
+ test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
$INSTALL_DATA $sdir_top/$file $instdir || exit 1
fi
done
Index: Doc/Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- Doc/Makefile.in 2000/12/05 05:07:52 1.7
+++ Doc/Makefile.in 2001/05/20 10:11:21
@@ -250,7 +250,7 @@
# install man pages, creating install directory if necessary
install.man: man
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
+ ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
for file in $(MAN); do \
$(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \
done
@@ -258,7 +258,7 @@
# install info pages, creating install directory if necessary
install.info: texi
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
+ ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
rm -rf infodir
mkdir infodir
if ( \
@@ -296,7 +296,7 @@
# install HTML manual
install.html: html
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
+ ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
for file in zsh_*.html; do \
$(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
done
Index: Src/Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Makefile.in,v
retrieving revision 1.10
diff -u -r1.10 Makefile.in
--- Src/Makefile.in 2001/04/23 19:59:04 1.10
+++ Src/Makefile.in 2001/05/20 10:11:21
@@ -161,7 +161,7 @@
# install binary, creating install directory if necessary
install.bin-here: zsh$(EXEEXT) $(INSTLIB)
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
+ ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(STRIPFLAGS) zsh$(EXEEXT) $(DESTDIR)$(bindir)/$(tzsh)-$(VERSION)$(EXEEXT)
if test -f $(DESTDIR)$(bindir)/$(tzsh)$(EXEEXT); then \
rm -f $(DESTDIR)$(bindir)/$(tzsh).old; \
@@ -174,7 +174,7 @@
install.bin-N:
install.bin-L: $(LIBZSH)
- $(sdir_top)/mkinstalldirs $(DESTDIR)$(libdir)/$(tzsh)
+ ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(libdir)/$(tzsh)
$(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(libdir)/$(tzsh)/$(LIBZSH)
install.cygwin-lib: $(LIBZSH)
$(INSTALL_PROGRAM) $(LIBZSH) $(DESTDIR)$(bindir)/$(LIBZSH)
Index: Src/mkmakemod.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/mkmakemod.sh,v
retrieving revision 1.10
diff -u -r1.10 mkmakemod.sh
--- Src/mkmakemod.sh 2001/04/23 19:59:04 1.10
+++ Src/mkmakemod.sh 2001/05/20 10:11:22
@@ -320,7 +320,7 @@
;; esac
instsubdir=`echo $name | sed 's,^,/,;s,/[^/]*$,,'`
echo "install.modules.${mddname}: ${mddname}.\$(DL_EXT)"
- echo " \$(sdir_top)/mkinstalldirs \$(DESTDIR)\$(MODDIR)${instsubdir}"
+ echo " \$(SHELL) \$(sdir_top)/mkinstalldirs \$(DESTDIR)\$(MODDIR)${instsubdir}"
echo " \$(INSTALL_PROGRAM) \$(STRIPFLAGS) ${mddname}.\$(DL_EXT) \$(DESTDIR)\$(MODDIR)/${name}.\$(DL_EXT)"
echo
echo "uninstall.modules.${mddname}:"
@@ -472,7 +472,7 @@
# tree, this is a problem. zsh's configure script edits config.status,
# adding the feature that an input filename starting with "!" has the
# "!" removed and is not mangled further.
- CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ./config.status
+ CONFIG_FILES=$the_subdir/${the_makefile}:\!$the_subdir/${the_makefile}.in CONFIG_HEADERS= ${CONFIG_SHELL-/bin/sh} ./config.status
fi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: PATCH: workaround for "config.status not found" on Cygwin
2001-05-20 10:23 ` Andrej Borsenkow
@ 2001-05-28 21:43 ` Christopher Faylor
2001-05-29 8:43 ` Andrej Borsenkow
0 siblings, 1 reply; 4+ messages in thread
From: Christopher Faylor @ 2001-05-28 21:43 UTC (permalink / raw)
To: zsh-workers
In article <002601c0e116$e8fd7a30$21c9ca95@mow.siemens.ru>,
Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru> wrote:
>-=-=-=-=-=-
>
>
>>
>> Cygwin can optionally use NTFS attributes to emulate Unix file permissions
>> (CYGWIN=...ntea...). In this case file on NTFS must have x bit to be
>> considered executable.
>
>It is worse. I build off SAMBA drive and none file on the SAMBA is
>considered executable in this case. It is O.K. if no ntea is set. So, this
>patch extends (and replaces) the previous one by sticking $(SHELL) or
>/bin/sh where possible.
This is due to an erroneous internal assumption in cygwin that ntea works
on a samba drive. I'll fix this in cygwin.
cgf
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: PATCH: workaround for "config.status not found" on Cygwin
2001-05-28 21:43 ` Christopher Faylor
@ 2001-05-29 8:43 ` Andrej Borsenkow
0 siblings, 0 replies; 4+ messages in thread
From: Andrej Borsenkow @ 2001-05-29 8:43 UTC (permalink / raw)
To: cgf, zsh-workers
> >
> >It is worse. I build off SAMBA drive and none file on the SAMBA is
> >considered executable in this case. It is O.K. if no ntea is
> set. So, this
> >patch extends (and replaces) the previous one by sticking $(SHELL) or
> >/bin/sh where possible.
>
> This is due to an erroneous internal assumption in cygwin that ntea works
> on a samba drive. I'll fix this in cygwin.
>
Approximate timeframe? This is the reason of test failure without any
workaround, so I'd be interested to try snapshot.
-andrej
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2001-05-29 8:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-05-20 9:22 PATCH: workaround for "config.status not found" on Cygwin Andrej Borsenkow
2001-05-20 10:23 ` Andrej Borsenkow
2001-05-28 21:43 ` Christopher Faylor
2001-05-29 8:43 ` Andrej Borsenkow
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).