xkeyboard-config: fixed xkbcomp binary usage and footprint (xkbcomp is a host requeri...

diff --git a/xkeyboard-config/.footprint b/xkeyboard-config/.footprint
index da10d8823b2e3f2a1a2c17dcaa4680a144024fc7..b0c2083243be07598a01737d472098c6fd7e21af 100644 (file)
--- a/xkeyboard-config/.footprint
+++ b/xkeyboard-config/.footprint
@@ -334,4 +334,4 @@ drwxr-xr-x  root/root       usr/share/X11/xkb/types/
 -rw-r--r--     root/root       usr/share/X11/xkb/types/mousekeys
 -rw-r--r--     root/root       usr/share/X11/xkb/types/numpad
 -rw-r--r--     root/root       usr/share/X11/xkb/types/pc
-lrwxrwxrwx     root/root       usr/share/X11/xkb/xkbcomp -> /devel/crux-arm/toolchain/clfs/usr/bin/xkbcomp
+lrwxrwxrwx     root/root       usr/share/X11/xkb/xkbcomp -> /usr/bin/xkbcomp

diff --git a/xkeyboard-config/Pkgfile b/xkeyboard-config/Pkgfile
index a94ea3c118bb1e01618395f1a65741af8c2e03cb..b2d1b72349d3f124cdb5ce23aec3d79d8f4264f8 100644 (file)
--- a/xkeyboard-config/Pkgfile
+++ b/xkeyboard-config/Pkgfile
@@ -12,14 +12,11 @@ source=(http://xlibs.freedesktop.org/xkbdesc/$name-$version.tar.bz2)
 build() {
   cd xkeyboard-config-$version
 
-  echo "ac_cv_path_XKBCOMP=\"$CLFS/usr/bin/xkbcomp\"" > config.cache
-
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --with-xkb-base=/usr/share/X11/xkb \
-              --with-xkb-rules-symlink=xorg \
-              --cache-file=config.cache
+              --with-xkb-rules-symlink=xorg
 
   make
   make DESTDIR=$PKG install