Changeset deb72bc

Timestamp:

Mar 10, 2006, 3:03:38 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

a8a1084

Parents:

46f79ff

Message:

r2512@server (orig r1251): ryan | 2006-03-10 02:09:04 -0800

r1301@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

Location:

scripts/scripts

Files:

• blfs-scripts/blfs-tcl.sh (modified) (1 diff)
• native-scripts/temp-tcl.sh (modified) (1 diff)
• untested/blfs-scripts/blfs-tk.sh (modified) (1 diff)

scripts/scripts/blfs-scripts/blfs-tcl.sh

@@ -21 +21 @@
    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}

scripts/scripts/native-scripts/temp-tcl.sh

@@ -37 +37 @@
 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}" \

scripts/scripts/untested/blfs-scripts/blfs-tk.sh

@@ -28 +28 @@
 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}" \