zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix ICA build and a couple of other miscellaneous issues. Patch courtesy of Pierre Labastie.

Browse source
This commit is contained in:
Matthew Burgess 2012-02-07 22:30:26 +00:00
parent b515be7b2c
commit 93fd2d011e
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
LFS/master.sh
View file

@ -172,9 +172,14 @@ chapter6_Makefiles() {
cp chapter06/* chapter06$N cp chapter06/* chapter06$N
for script in chapter06$N/* ; do for script in chapter06$N/* ; do
# Overwrite existing symlinks, files, and dirs # Overwrite existing symlinks, files, and dirs
sed -e 's/ln -sv/&f/g' \ sed -e 's/ln *-sv/&f/g' \
-e 's/mv -v/&f/g' \ -e 's/mv *-v/&f/g' \
-e 's/mkdir -v/&p/g' -i ${script} -e 's/mkdir *-v/&p/g' -i ${script}
# Suppress the mod of "test-installation.pl" because now
# the library path points to /usr/lib
if [[ ${script} =~ glibc ]]; then
sed '/DL=/,/unset DL/d' -i ${script}
fi
# Rename the scripts # Rename the scripts
mv ${script} ${script}$N mv ${script} ${script}$N
done done
@ -337,6 +342,9 @@ chapter78_Makefiles() {
CHROOT_wrt_TouchTimestamp CHROOT_wrt_TouchTimestamp
fi fi
CHROOT_Unpack "$pkg_tarball" CHROOT_Unpack "$pkg_tarball"
# If using optimizations, use MAKEFLAGS (unless blacklisted)
# no setting of CFLAGS and friends.
[[ "$OPTIMIZE" != "0" ]] && wrt_makeflags "$name"
;; ;;
esac esac

6
common/blfs-tool-deps/905-docbook-xml
View file

@ -102,8 +102,10 @@ do
"file:///etc/xml/docbook" \ "file:///etc/xml/docbook" \
$PKG_DEST/etc/xml/catalog $PKG_DEST/etc/xml/catalog
done done
export PKGDIR=/sources/docbook-xml if ! [ -z "$PKG_DEST" ]; then
packInstall export PKGDIR=/sources/docbook-xml
packInstall
fi
rm -rf $PKG_DEST rm -rf $PKG_DEST
cd .. cd ..
rm -rf docbook-xml rm -rf docbook-xml

3
common/libs/func_blfs_deps
View file

@ -196,9 +196,10 @@ EOF
# Touch the tracking file. # Touch the tracking file.
case $name in case $name in
docbook-xml ) pkg_ver=DocBook-4.5 ;; docbook-xml ) pkg_ver=DocBook-4.5 ;;
lynx ) pkg_ver=lynx-2.8.7 ;; lynx ) pkg_ver=lynx-2.8.7rel.2 ;;
tidy ) pkg_ver=html-tidy-cvs_20101110 ;; tidy ) pkg_ver=html-tidy-cvs_20101110 ;;
unzip ) pkg_ver=unzip-6.0 ;; unzip ) pkg_ver=unzip-6.0 ;;
sqlite ) pkg_ver=sqlite-3.7.8 ;;
* ) pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;; * ) pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;;
esac esac
if [ "$PROGNAME" = "clfs2" ]; then if [ "$PROGNAME" = "clfs2" ]; then

5
common/libs/func_check_version.sh
View file

@ -90,10 +90,7 @@ check_prerequisites() { #
check_version "2.6.25" "`uname -r`" "KERNEL" check_version "2.6.25" "`uname -r`" "KERNEL"
check_version "3.2" "$BASH_VERSION" "BASH" check_version "3.2" "$BASH_VERSION" "BASH"
check_version "4.1.2" "`gcc -dumpversion`" "GCC" check_version "4.1.2" "`gcc -dumpversion`" "GCC"
libcLib="`find /lib /lib64 -name libc.so.6 -print`" check_version "2.5.1" "$(ldd --version | head -n1 | awk '{print $NF}')" "GLIBC"
libcVer="`/${libcLib} | head -n1`"
libcVer="${libcVer##*version }"
check_version "2.5.1" "${libcVer%%,*}" "GLIBC"
check_version "2.17" "$(ld --version | head -n1 | awk '{print $NF}')" "BINUTILS" check_version "2.17" "$(ld --version | head -n1 | awk '{print $NF}')" "BINUTILS"
check_version "1.18" "$(tar --version | head -n1 | cut -d" " -f4)" "TAR" check_version "1.18" "$(tar --version | head -n1 | cut -d" " -f4)" "TAR"
bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)" bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)"

2
common/libs/func_download_pkgs
View file

@ -121,7 +121,7 @@ get_sources() { # Download file, write name to MISSING_FILES.DMP if
fi fi
# Good or bad we write the original md5sum to a file # Good or bad we write the original md5sum to a file
echo "$MD5" >> MD5SUM echo "$MD5" >> MD5SUMS
# Copy the freshly downloaded file # Copy the freshly downloaded file
# to the source archive. # to the source archive.