Author: alexander
Date: 2007-11-08 05:23:02 -0700 (Thu, 08 Nov 2007)
New Revision: 2133
Added:
trunk/packages/jhalfs/jhalfs-2.3.1-locale-1.patch
Modified:
trunk/packages/jhalfs/Makefile
Log:
Fixed jhalfs failure due to translated bersion strings
Modified: trunk/packages/jhalfs/Makefile
===================================================================
--- trunk/packages/jhalfs/Makefile 2007-11-08 12:22:08 UTC (rev 2132)
+++ trunk/packages/jhalfs/Makefile 2007-11-08 12:23:02 UTC (rev 2133)
@@ -9,6 +9,8 @@
SHA-$(FILE)= 95a41e2e1c3ff01feaaefafeda7d187760a24dfe
FILE1= configuration
+
+PATCH1= jhalfs-2.3.1-locale-1.patch
# Targets
include $(ROOT)/scripts/functions
@@ -18,11 +20,14 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE) $(FILE1)
- @$(call echo_message, Building)
+ $(std_build)
+
+compile-stage2:
+ patch -Np1 -i ../$(PATCH1)
+ cp ../$(FILE1) .
mkdir -p /home/jhalfs
cp -v $(ROOT)/root/.bashrc /home/jhalfs/.bashrc
- cd /home/jhalfs ; unpack $(SRC)/$(FILE)
- cp -v $(FILE1) /home/jhalfs/$(DIR)
+ cp -av . /home/jhalfs/$(DIR)
chown -R jhalfs:jhalfs /home/jhalfs
@touch $@
Added: trunk/packages/jhalfs/jhalfs-2.3.1-locale-1.patch
===================================================================
--- trunk/packages/jhalfs/jhalfs-2.3.1-locale-1.patch
(rev 0)
+++ trunk/packages/jhalfs/jhalfs-2.3.1-locale-1.patch 2007-11-08 12:23:02 UTC
(rev 2133)
@@ -0,0 +1,14 @@
+diff -urN jhalfs-2.3.1.orig/common/libs/func_check_version.sh
jhalfs-2.3.1/common/libs/func_check_version.sh
+--- jhalfs-2.3.1.orig/common/libs/func_check_version.sh 2007-08-02
22:47:23.000000000 +0600
++++ jhalfs-2.3.1/common/libs/func_check_version.sh 2007-11-07
20:13:10.000000000 +0500
+@@ -77,6 +77,10 @@
+ check_prerequisites() { #
+ #----------------------------#
+
++ # Avoid translation of version strings
++ local LC_ALL=C
++ export LC_ALL
++
+ # LFS/HLFS/CLFS prerequisites
+ check_version "2.6.2" "`uname -r`" "KERNEL"
+ check_version "3.0" "$BASH_VERSION" "BASH"
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
