Opened 15 years ago

Closed 15 years ago

#2123 closed defect (fixed)

luit sed not required?

Reported by: Bryan Kadzban Owned by: dnicholson@…
Priority: normal Milestone: 6.2.0
Component: BOOK Version: SVN
Severity: normal Keywords:
Cc:

Description

The incorrect /usr/X11R6 path isn't actually coded into any of the binaries created by luit, even though it shows up in the parser.h header file. The code in that header looks like this:

#ifndef LOCALE_ALIAS_FILE
#define LOCALE_ALIAS_FILE "/usr/X11R6/lib/X11/locale/locale.alias"
#endif

It only sets the wrong alias file path when nothing is already defined. But when luit is compiled, all the compilation commands look like this (rewrapped for clarity):

gcc -DHAVE_CONFIG_H -I. -I. -I.    -D_XOPEN_SOURCE \
          -DLOCALE_ALIAS_FILE=\"/usr/lib/X11/locale/locale.alias\" \
          -g -O2 -MT luit-sys.o -MD -MP -MF ".deps/luit-sys.Tpo" \
          -c -o luit-sys.o `test -f 'sys.c' || echo './'`sys.c

which already defines LOCALE_ALIAS_FILE (on the second line). So the sed should not be required, because the incorrect #define from the header will never be used.

As a test, I tried compiling luit with and without the sed. Results:

$ sed <whatever>
$ patch <whatever>
$ ./configure $XORG_CONFIG
<blah blah blah>
$ make
<blah blah blah>
$ mv luit ../luit-sed
$ <blow away the luit-1.0.1 directory and reextract>
$ patch <whatever>
$ ./configure $XORG_CONFIG
<blah blah blah -- same as last time>
$ make
<blah blah blah -- same as last time>
$ mv luit ../luit-nosed
$ cd ..
$ strings luit-sed | grep X11
libX11.so.6
/usr/lib/X11/locale/locale.alias
$ strings luit-nosed | grep X11
libX11.so.6
/usr/lib/X11/locale/locale.alias
$ 

No /usr/X11R6 to be seen in either file.

(Now, yes, upstream should probably change that header file. But it does work.)

Change History (4)

comment:1 by DJ Lucas, 15 years ago

And that header is used only at luit's build time. Good catch. Will get to it soon.

comment:2 by Randy McMurchy, 15 years ago

Priority: lownormal
Severity: minornormal
Type: enhancementdefect

comment:3 by dnicholson@…, 15 years ago

Owner: changed from blfs-book@… to dnicholson@…
Status: newassigned

comment:4 by dnicholson@…, 15 years ago

Resolution: fixed
Status: assignedclosed

Fixed in r6448.

Note: See TracTickets for help on using tickets.