Author: alexander
Date: 2005-07-14 02:48:24 -0600 (Thu, 14 Jul 2005)
New Revision: 350
Added:
x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch
Modified:
x86/branches/utf8/Makefile
x86/branches/utf8/packages/grep/Makefile
x86/branches/utf8/packages/groff/Makefile
Log:
Built packages before Man
Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile 2005-07-13 03:36:45 UTC (rev 349)
+++ x86/branches/utf8/Makefile 2005-07-14 08:48:24 UTC (rev 350)
@@ -174,8 +174,8 @@
ch-readline ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext
ch-inetutils \
ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
-post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs
stop-here ch-grep ch-grub ch-gzip \
- ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps
ch-psmisc ch-shadow \
+post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs
ch-grep ch-grub ch-gzip \
+ ch-hotplug stop-here ch-man ch-make ch-module-init-tools ch-patch
ch-procps ch-psmisc ch-shadow \
ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment
blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe
ch-screen ch-curl ch-zip \
Modified: x86/branches/utf8/packages/grep/Makefile
===================================================================
--- x86/branches/utf8/packages/grep/Makefile 2005-07-13 03:36:45 UTC (rev
349)
+++ x86/branches/utf8/packages/grep/Makefile 2005-07-14 08:48:24 UTC (rev
350)
@@ -5,10 +5,57 @@
VRS= 2.5.1a
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
+# PATCH1= grep_2.5.1.ds1-5.diff
URL= $(HTTP)/$(NM)/$(FILE)
-
+# URL1= http://ftp.debian.org/debian/pool/main/g/$(NM)/$(PATCH1).gz
# RULES
+# TESTCASES:
+# Debian:
+# -case_fold: echo aaa | LANG=en_US.UTF-8 grep --ignore-case '[[:upper:]]'
+# -case_fold-charclass: echo Y | LANG=en_US.UTF-8 egrep -i '[y]'
+# (also fixed by RedHat's -i18n, maybe not needed?)
+# -charclass-bracket: echo "[" | LANG=en_US.UTF-8 grep "[[:space:]]"
+# (same as RedHat's -bracket, thus not applied)
+# -case_fold-range: echo Z | LANG=en_US.UTF-8 grep --ignore-case '[a-z]'
+# All of the above modify src/dfa.c
+# There are surely more problems in that file.
+#
+# -bigfile: http://bugs.debian.org/185208
+# (not applied because of unknown interaction with VM overcommit)
+#
+# RedHat:
+# -fgrep: ???, but required for other patches
+# -bracket: echo "[" | LANG=en_US.UTF-8 grep "[[:space:]]"
+# -i18n: many, required for LSB.
+# -oi: echo xxYYzz | LANG=C grep -i -o yy
+# -manpage: typo
+# -color: restore the background color correctly
+# -icolor: ??? echo 'spam foo SPAM FOO' | grep -i --color spam
+# (but that's also fixed by -oi. Is this patch just a cleanup?)
+# -egf-speedup: without this, grep is as slow as a snail in UTF-8 locales.
+# -dfa-optional: disables dfa in multibyte locales by default.
+# -charclass-* are obsolete because of this patch
+# it is still nice to have some fixes enev if GREP_USE_DFA=1.
+# -w: (echo 'foo';echo 'fo') > /tmp/testfile && grep -F -w fo /tmp/testfile
+
+DEBPATCHES= \
+ 55-bigfile.patch
+
+RHPATCHES= \
+ grep-2.5.1-fgrep.patch \
+ grep-2.5.1-bracket.patch \
+ grep-2.5-i18n.patch \
+ grep-2.5.1-oi.patch \
+ grep-2.5.1-manpage.patch \
+ grep-2.5.1-color.patch \
+ grep-2.5.1-icolor.patch \
+ grep-2.5.1-egf-speedup.patch \
+ grep-2.5.1-dfa-optional.patch \
+ grep-2.5.1-tests.patch \
+ grep-2.5.1-w.patch
+
+
.PHONY: stage1 clean chroot stage2
stage1:
@@ -32,6 +79,9 @@
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
@if [ ! -f /bin/grep ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+ for RHPATCH in $(RHPATCHES) ; do \
+ patch -Np1 -i $(REDHAT)/grep/$$RHPATCH ; \
+ done && \
./configure --prefix=/usr --bindir=/bin && \
make -j3 && make install ; fi
@make clean
Modified: x86/branches/utf8/packages/groff/Makefile
===================================================================
--- x86/branches/utf8/packages/groff/Makefile 2005-07-13 03:36:45 UTC (rev
349)
+++ x86/branches/utf8/packages/groff/Makefile 2005-07-14 08:48:24 UTC (rev
350)
@@ -2,9 +2,11 @@
# Package versions
NM= groff
+# XXX: add Japanese and ascii8 patches. ascii8 exists only for groff-1.18.1.1
VRS= 1.19.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
+PATCH= $(DIR)-force_ascii-1.patch
URL= $(HTTP)/$(NM)/$(FILE)
# RULES
@@ -21,9 +23,10 @@
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
@if [ ! -f /usr/bin/gtbl ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) &&
\
+ patch -Np1 -i ../$(PATCH) && \
PAGE=$(pagesize) ./configure --prefix=/usr && make && make install && \
- ln -s soelim /usr/bin/zsoelim && ln -s eqn /usr/bin/geqn && \
- ln -s tbl /usr/bin/gtbl ; fi
+ ln -sf soelim /usr/bin/zsoelim && ln -sf eqn /usr/bin/geqn && \
+ ln -sf tbl /usr/bin/gtbl ; fi
@make clean
clean:
Added: x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch
===================================================================
--- x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch
2005-07-13 03:36:45 UTC (rev 349)
+++ x86/branches/utf8/packages/groff/groff-1.19.1-force_ascii-1.patch
2005-07-14 08:48:24 UTC (rev 350)
@@ -0,0 +1,69 @@
+Submitted By: Alexander E. Patrakov
+Date: 2005-07-14
+Initial Package Version: 1.19.1
+Upstream Status: Not submitted, hack
+Origin: Alexander E. Patrakov
+Depends: texinfo-4.8-multibyte-1.patch
+Description: Prevents non-ASCII characters from entering the "info" program
+in multibyte locales since "info" miscalculates their width. Patched "info"
+sets both LC_ALL and LANGUAGE to "C" in such locales when calling "man".
+
+diff -ur groff-1.19.1.orig/src/roff/nroff/nroff.sh
groff-1.19.1/src/roff/nroff/nroff.sh
+--- groff-1.19.1.orig/src/roff/nroff/nroff.sh 2004-04-06 20:10:32.000000000
+0600
++++ groff-1.19.1/src/roff/nroff/nroff.sh 2005-07-14 14:26:26.339777584
+0600
+@@ -3,35 +3,16 @@
+
+ prog="$0"
+ # Default device.
+-# First try the "locale charmap" command, because it's most reliable.
+-# On systems where it doesn't exist, look at the environment variables.
++# This works only for ISO-8859-1 encoded manual pages.
+ case "`exec 2>/dev/null ; locale charmap`" in
+ UTF-8)
+ T=-Tutf8 ;;
+- ISO-8859-1)
++ ISO-8859-1 | ISO-8859-15)
+ T=-Tlatin1 ;;
+ IBM-1047)
+ T=-Tcp1047 ;;
+ *)
+- case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
+- *.UTF-8)
+- T=-Tutf8 ;;
+- iso_8859_1 | *.ISO-8859-1)
+- T=-Tlatin1 ;;
+- *.IBM-1047)
+- T=-Tcp1047 ;;
+- *)
+- case "$LESSCHARSET" in
+- utf-8)
+- T=-Tutf8 ;;
+- latin1)
+- T=-Tlatin1 ;;
+- cp1047)
+- T=-Tcp1047 ;;
+- *)
+- T=-Tascii ;;
+- esac ;;
+- esac ;;
++ T=-Tascii ;;
+ esac
+ opts=
+
+@@ -84,6 +65,16 @@
+ shift
+ done
+
++# LFS-specific hack, so that non-ascii characters are never sent to "info"
++# in multibyte locales
++# Depends upon texinfo-4.8-multibyte-1.patch
++
++if [ "$LANGUAGE" = "C" ] && [ "$LC_ALL" = "C" ]
++then
++ # Override user-supplied -T option, if any
++ T=-Tascii
++fi
++
+ # Set up the `GROFF_BIN_PATH' variable
+ # to be exported in the current `GROFF_RUNTIME' environment.
+
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
