r1251 - in trunk: . scripts/scripts/blfs-scripts scripts/scripts/native-scripts scripts/scripts/untested/blfs-scripts

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Fri Mar 10 02:09:05 PST 2006


Author: ryan
Date: 2006-03-10 03:09:04 -0700 (Fri, 10 Mar 2006)
New Revision: 1251

Modified:
   trunk/
   trunk/scripts/scripts/blfs-scripts/blfs-tcl.sh
   trunk/scripts/scripts/native-scripts/temp-tcl.sh
   trunk/scripts/scripts/untested/blfs-scripts/blfs-tk.sh
Log:
 r1301 at rei:  lfs | 2006-03-09 19:34:34 +1100
 Fix configure issues in tcl and Tk versions 8.4.11 and 8.4.12 when using bash-3.1



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1300
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1301
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Modified: trunk/scripts/scripts/blfs-scripts/blfs-tcl.sh
===================================================================
--- trunk/scripts/scripts/blfs-scripts/blfs-tcl.sh	2006-03-10 10:08:45 UTC (rev 1250)
+++ trunk/scripts/scripts/blfs-scripts/blfs-tcl.sh	2006-03-10 10:09:04 UTC (rev 1251)
@@ -21,6 +21,14 @@
    sed '/TCL_LIBRARY/s@\$(prefix)/lib@$(libdir)@g' Makefile.in-ORIG > Makefile.in
 fi
 
+# Fix brokenness in configure with bash-3.1
+case ${TCL_VER} in
+   8.4.1[12] )
+      if [ ! -f configure-ORIG ]; then cp configure configure-ORIG ; fi
+      sed "s/relid'/relid/" < configure-ORIG > configure
+   ;;
+esac
+
 max_log_init Tcl ${TCL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
 CFLAGS="${TGT_CFLAGS}" \

Modified: trunk/scripts/scripts/native-scripts/temp-tcl.sh
===================================================================
--- trunk/scripts/scripts/native-scripts/temp-tcl.sh	2006-03-10 10:08:45 UTC (rev 1250)
+++ trunk/scripts/scripts/native-scripts/temp-tcl.sh	2006-03-10 10:09:04 UTC (rev 1251)
@@ -36,6 +36,13 @@
       Makefile.in-ORIG > Makefile.in
 fi
 
+# Fix brokenness in configure with bash-3.1
+case ${TCL_VER} in
+   8.4.1[12] )
+      if [ ! -f configure-ORIG ]; then cp configure configure-ORIG ; fi
+      sed "s/relid'/relid/" < configure-ORIG > configure
+   ;;
+esac
 max_log_init Tcl ${TCL_VER} "temp (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
 ./configure --prefix=${BUILD_PREFIX} ${extra_conf} \

Modified: trunk/scripts/scripts/untested/blfs-scripts/blfs-tk.sh
===================================================================
--- trunk/scripts/scripts/untested/blfs-scripts/blfs-tk.sh	2006-03-10 10:08:45 UTC (rev 1250)
+++ trunk/scripts/scripts/untested/blfs-scripts/blfs-tk.sh	2006-03-10 10:09:04 UTC (rev 1251)
@@ -27,7 +27,15 @@
          Makefile.in-ORIG > Makefile.in
 fi
 
-max_log_init Tcl ${TK_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+# Fix brokenness in configure with bash-3.1
+case ${TK_VER} in
+   8.4.1[12] )
+      if [ ! -f configure-ORIG ]; then cp configure configure-ORIG ; fi
+      sed "s/relid'/relid/" < configure-ORIG > configure
+   ;;
+esac
+
+max_log_init Tk ${TK_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
 CFLAGS="${TGT_CFLAGS}" \
  ./configure --prefix=/usr --enable-threads ${extra_conf} \




More information about the cross-lfs mailing list