[Lunar-commits] <moonbase> bash, bash_static: use some compile time parameters for compiling with gcc 4.3.x.

[Florin Braescu]

commit b7d01d853f658fb196139f9a66168db7bb206d3b
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Apr 5 18:51:02 2009 +0300

    bash, bash_static: use some compile time parameters for compiling with gcc 4.3.x.
---
 shells/bash/BUILD          |   30 +++++++++++++++++-------------
 shells/bash/DEPENDS        |    2 +-
 shells/bash/DETAILS        |    8 ++++----
 shells/bash_static/BUILD   |   17 +++++++++--------
 shells/bash_static/DEPENDS |    2 +-
 shells/bash_static/DETAILS |    9 +++++----
 6 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/shells/bash/BUILD b/shells/bash/BUILD
index 3938d7e..99e119f 100644
--- a/shells/bash/BUILD
+++ b/shells/bash/BUILD
@@ -2,29 +2,33 @@
 
   bad_flags -malign-double
 
-  OPTS+=" --bindir=/bin --with-installed-readline --with-curses"
+  OPTS+=" --bindir=/bin             \
+          --with-installed-readline \
+	  --with-curses             \
+	  --without-bash-malloc     \
+	  ac_cv_func_working_mktime=yes"  &&
 
-  default_build &&
-  ln -sf bash /bin/sh &&
-  ln -f /bin/bash /bin/rbash &&
+  default_build  &&
+  ln -sf bash /bin/sh  &&
+  ln -f /bin/bash /bin/rbash  &&
 
-  rm -f /usr/share/man/man1/bash.1 &&
-  rm -f /usr/share/man/man1/bashbug.1 &&
+  rm -f /usr/share/man/man1/bash.1  &&
+  rm -f /usr/share/man/man1/bashbug.1  &&
 
   for MANPAGE in doc/*.1 ; do
-    gzip -9 $MANPAGE &&
+    gzip -9 $MANPAGE  &&
     install -m0644 $MANPAGE.gz /usr/share/man/man1
-  done &&
+  done  &&
 
-  mkdir -p /etc/skel &&
+  mkdir -p /etc/skel  &&
 
   if [ -L /etc/skel/.bashrc ] ; then
     rm /etc/skel/.bashrc
-  fi &&
+  fi  &&
 
   if [ -f /etc/profile.d ] ; then
     rm /etc/profile.d
-  fi &&
+  fi  &&
 
   if [ ! -d /etc/profile.d ]; then
     mkdir -p /etc/profile.d
@@ -54,11 +58,11 @@
       fi
       message "${MESSAGE_COLOR}Make sure your users also get the new .bash* from /etc/skel! ${DEFAULT_COLOR}"
     fi
-  fi &&
+  fi  &&
 
   if [ ! -e /etc/profile ] ; then
     install -m 644 -o root -g root $SCRIPT_DIRECTORY/profile /etc/profile
-  fi &&
+  fi  &&
   if [ ! -e /etc/bashrc ] ; then
     install -m 644 -o root -g root $SCRIPT_DIRECTORY/bashrc /etc/bashrc
   fi
diff --git a/shells/bash/DEPENDS b/shells/bash/DEPENDS
index d4c42fe..30ee686 100644
--- a/shells/bash/DEPENDS
+++ b/shells/bash/DEPENDS
@@ -1,2 +1,2 @@
-depends  ncurses   &&
+depends  ncurses
 depends  readline
diff --git a/shells/bash/DETAILS b/shells/bash/DETAILS
index f1eb7a8..dda9467 100644
--- a/shells/bash/DETAILS
+++ b/shells/bash/DETAILS
@@ -1,14 +1,14 @@
           MODULE=bash
          VERSION=3.2.48
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=$GNU_URL/$MODULE/
-   SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE/
-   SOURCE_URL[2]=ftp://ftp.cwru.edu/pub/$MODULE/
+   SOURCE_URL[0]=$GNU_URL/$MODULE
+   SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
+   SOURCE_URL[2]=ftp://ftp.cwru.edu/pub/$MODULE
       SOURCE_VFY=sha1:ed10f49e57bb83e717ebb85bb5662e24ac5ba37c
         WEB_SITE=http://tiswww.case.edu/php/chet/bash/bashtop.html
          ENTERED=20010922
          UPDATED=20090317
-           SHORT="shell of the GNU operating system."
+           SHORT="A shell of the GNU operating system"
 PSAFE=no
 
 cat << EOF
diff --git a/shells/bash_static/BUILD b/shells/bash_static/BUILD
index 8f1faad..0ced2b7 100644
--- a/shells/bash_static/BUILD
+++ b/shells/bash_static/BUILD
@@ -2,16 +2,17 @@
 
     bad_flags -malign-double
 
-    OPTS=$OPTS" --bindir=/bin \
-                --without-bash-malloc \
+    OPTS=$OPTS" --bindir=/bin             \
+                --without-bash-malloc     \
                 --with-installed-readline \
-                --with-curses \
-                --enable-static-link"
+                --with-curses             \
+                --enable-static-link      \
+		ac_cv_func_working_mktime=yes"  &&
 
-    default_config                &&
-    make version.h                &&
-    make                          &&
-    prepare_install               &&
+    default_config   &&
+    make version.h   &&
+    make             &&
+    prepare_install  &&
     cp bash /bin/bash_static
 
 ) > $C_FIFO 2>&1
diff --git a/shells/bash_static/DEPENDS b/shells/bash_static/DEPENDS
index d4c42fe..30ee686 100644
--- a/shells/bash_static/DEPENDS
+++ b/shells/bash_static/DEPENDS
@@ -1,2 +1,2 @@
-depends  ncurses   &&
+depends  ncurses
 depends  readline
diff --git a/shells/bash_static/DETAILS b/shells/bash_static/DETAILS
index 363f6f2..334bc9f 100644
--- a/shells/bash_static/DETAILS
+++ b/shells/bash_static/DETAILS
@@ -2,14 +2,15 @@
          VERSION=3.2.48
           SOURCE=bash-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/bash-$VERSION
-   SOURCE_URL[0]=$GNU_URL/bash/
-   SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/bash/
-   SOURCE_URL[2]=ftp://ftp.cwru.edu/pub/bash/
+   SOURCE_URL[0]=$GNU_URL/bash
+   SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/bash
+   SOURCE_URL[2]=ftp://ftp.cwru.edu/pub/bash
       SOURCE_VFY=sha1:ed10f49e57bb83e717ebb85bb5662e24ac5ba37c
         WEB_SITE=http://tiswww.case.edu/php/chet/bash/bashtop.html
          ENTERED=20020615
          UPDATED=20090317
-           SHORT="static build of bash, named as bash_static"
+           SHORT="A static build of bash, named as bash_static"
+
 cat << EOF
 bash - Shell of the GNU operating system.
 This is the static build of bash; call bash_static to use it.