diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /slang | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'slang')
-rw-r--r-- | slang/slang/Makefile.patch | 26 | ||||
-rw-r--r-- | slang/slang/configure.patch | 157 |
2 files changed, 183 insertions, 0 deletions
diff --git a/slang/slang/Makefile.patch b/slang/slang/Makefile.patch index e69de29bb2..a79b2b9ae3 100644 --- a/slang/slang/Makefile.patch +++ b/slang/slang/Makefile.patch @@ -0,0 +1,26 @@ +--- slang-1.4.9/autoconf/Makefile.in.orig 2004-09-24 15:51:57.054180737 +0100 ++++ slang-1.4.9/autoconf/Makefile.in 2004-09-24 15:52:47.065068195 +0100 +@@ -13,12 +13,12 @@ + @echo Use make install-elf to install it. + runtests: + cd src; $(MAKE) runtests +-demos: +- cd demo; $(MAKE) ++#demos: ++# cd demo; $(MAKE) + clean: + /bin/rm -f *~ + cd src; $(MAKE) clean +- cd demo; $(MAKE) clean ++# cd demo; $(MAKE) clean + install: + cd src; $(MAKE) install + install-elf: +@@ -32,6 +32,6 @@ + distclean: + /bin/rm -f *~ Makefile config.status config.log config.cache files.pck + cd src; $(MAKE) distclean +- cd demo; $(MAKE) distclean ++# cd demo; $(MAKE) distclean + # + diff --git a/slang/slang/configure.patch b/slang/slang/configure.patch index e69de29bb2..e2d78acb72 100644 --- a/slang/slang/configure.patch +++ b/slang/slang/configure.patch @@ -0,0 +1,157 @@ +--- slang-1.4.9/configure.orig 2004-09-24 14:12:25.619997396 +0100 ++++ slang-1.4.9/configure 2004-09-24 14:15:25.579414174 +0100 +@@ -2457,7 +2457,7 @@ + + + +-subdirs="demo" ++#subdirs="demo" + + + trap '' 1 2 15 +@@ -2876,76 +2876,76 @@ + esac + done + +- for ac_config_dir in demo; do +- +- # Do not complain, so a configure script can configure whichever +- # parts of a large source tree are present. +- if test ! -d $srcdir/$ac_config_dir; then +- continue +- fi +- +- echo configuring in $ac_config_dir +- +- case "$srcdir" in +- .) ;; +- *) +- if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; +- else +- { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } +- fi +- ;; +- esac +- +- ac_popdir=`pwd` +- cd $ac_config_dir +- +- # A "../" for each directory in /$ac_config_dir. +- ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` +- +- case "$srcdir" in +- .) # No --srcdir option. We are building in place. +- ac_sub_srcdir=$srcdir ;; +- /*) # Absolute path. +- ac_sub_srcdir=$srcdir/$ac_config_dir ;; +- *) # Relative path. +- ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; +- esac +- +- # Check for guested configure; otherwise get Cygnus style configure. +- if test -f $ac_sub_srcdir/configure; then +- ac_sub_configure=$ac_sub_srcdir/configure +- elif test -f $ac_sub_srcdir/configure.in; then +- ac_sub_configure=$ac_configure +- else +- echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 +- ac_sub_configure= +- fi +- +- # The recursion is here. +- if test -n "$ac_sub_configure"; then +- +- # Make the cache file name correct relative to the subdirectory. +- case "$cache_file" in +- /*) ac_sub_cache_file=$cache_file ;; +- *) # Relative path. +- ac_sub_cache_file="$ac_dots$cache_file" ;; +- esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac +- +- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" ++# for ac_config_dir in demo; do ++# ++# # Do not complain, so a configure script can configure whichever ++# # parts of a large source tree are present. ++# if test ! -d $srcdir/$ac_config_dir; then ++# continue ++# fi ++# ++# echo configuring in $ac_config_dir ++# ++# case "$srcdir" in ++# .) ;; ++# *) ++# if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; ++# else ++# { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } ++# fi ++# ;; ++# esac ++# ++# ac_popdir=`pwd` ++# cd $ac_config_dir ++# ++# # A "../" for each directory in /$ac_config_dir. ++# ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` ++# ++# case "$srcdir" in ++# .) # No --srcdir option. We are building in place. ++# ac_sub_srcdir=$srcdir ;; ++# /*) # Absolute path. ++# ac_sub_srcdir=$srcdir/$ac_config_dir ;; ++# *) # Relative path. ++# ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; ++# esac ++# ++# # Check for guested configure; otherwise get Cygnus style configure. ++# if test -f $ac_sub_srcdir/configure; then ++# ac_sub_configure=$ac_sub_srcdir/configure ++# elif test -f $ac_sub_srcdir/configure.in; then ++# ac_sub_configure=$ac_configure ++# else ++# echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 ++# ac_sub_configure= ++# fi ++# ++# # The recursion is here. ++# if test -n "$ac_sub_configure"; then ++# ++# # Make the cache file name correct relative to the subdirectory. ++# case "$cache_file" in ++# /*) ac_sub_cache_file=$cache_file ;; ++# *) # Relative path. ++# ac_sub_cache_file="$ac_dots$cache_file" ;; ++# esac ++# case "$ac_given_INSTALL" in ++# [/$]*) INSTALL="$ac_given_INSTALL" ;; ++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++# esac ++# ++# echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. +- if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir +- then : +- else +- { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } +- fi +- fi +- +- cd $ac_popdir +- done ++# if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ++# then : ++# else ++# { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } ++# fi ++# fi ++# ++# cd $ac_popdir ++# done + fi + + |