$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch
ifeq "$(LFS_PASS)" "install"
- cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" CC=/usr/bin/gcc ./configure --disable-nls
+ cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure --disable-nls
cd $(DIR_APP)/src && make CFLAGS="-Os -fomit-frame-pointer" DATA_DIR=/lib/kbd BINDIR=/bin setfont kbd_mode dumpkeys loadkeys loadunimap showconsolefont
cd $(DIR_APP)/src && install -m 0755 setfont loadunimap kbd_mode dumpkeys loadkeys showconsolefont unicode_start unicode_stop /install/initrd/bin
mkdir -p /install/initrd/lib/kbd/consolefonts
cd $(DIR_APP) && ./configure --without-gpm-support --host $(MACHINE)-uclibc
cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
cd $(DIR_APP) && make libnewt.a
- -mkdir -p /install/$(MACHINE)-uClibc/{include,lib}
- cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib/libnewt.a
- cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h
+ -mkdir -p /opt/$(MACHINE)-uClibc/{include,lib}
+ cd $(DIR_APP) && install -m 0644 libnewt.a /opt/$(MACHINE)-uClibc/lib/libnewt.a
+ cd $(DIR_APP) && install -m 0644 newt.h /opt/$(MACHINE)-uClibc/include/newt.h
else
cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support
cd $(DIR_APP) && sed -i \
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" ./configure
cd $(DIR_APP)/lib && CFLAGS="-Os -fomit-frame-pointer" make $(MAKETUNING)
- -mkdir -p /install/$(MACHINE)-uClibc/include/pci
- cd $(DIR_APP) && install -m 0644 lib/libpci.a /install/$(MACHINE)-uClibc/lib
- cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /install/$(MACHINE)-uClibc/include/pci
+ -mkdir -p /opt/$(MACHINE)-uClibc/include/pci
+ cd $(DIR_APP) && install -m 0644 lib/libpci.a /opt/$(MACHINE)-uClibc/lib
+ cd $(DIR_APP) && install -m 0644 lib/{config,header,pci}.h /opt/$(MACHINE)-uClibc/include/pci
else
cd $(DIR_APP) && make PREFIX=/usr $(MAKETUNING)
cd $(DIR_APP) && make PREFIX=/usr install
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./configure --prefix=""
- cd $(DIR_APP) && make $(MAKETUNING) elf
- cd $(DIR_APP)/src && make install-elf DESTDIR="/opt/$(MACHINE)-uClibc"
- rm -vf /opt/$(MACHINE)-uClibc/lib/libslang.so*
+ cd $(DIR_APP)/src && patch < $(DIR_SRC)/src/patches/slang-$(VER)-uclibc.patch
+ cd $(DIR_APP)/src && make $(MAKETUNING)
+ cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
else
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
cd $(DIR_APP) && make $(MAKETUNING)
--- /dev/null
+Submitted By: Greg Schafer <greg at linuxfromscratch dot org>
+Date: 2004-01-07
+Initial Package Version: 1.10
+Origin: LFS Book and Anderson Lizardo <lizardo at linuxfromscratch dot org>
+ (based on kbd-1.08-more-programs.patch)
+Description: Install additional programs included in kbd package,
+ including their manpages. Note: setlogcons does not have
+ a manpage.
+
+diff -Naur kbd-1.10.orig/man/Makefile kbd-1.10/man/Makefile
+--- kbd-1.10.orig/man/Makefile 2002-10-11 22:12:53.000000000 +0000
++++ kbd-1.10/man/Makefile 2004-01-07 02:36:13.471404128 +0000
+@@ -7,6 +7,9 @@
+ install -d -m 755 $(MANDIR)/$$i; \
+ install -m 644 $$i/*.[0-9] $(MANDIR)/$$i; \
+ done
++ install -d -m 755 $(MANDIR)/man8
++ install -m 644 man8misc/setvesablank.8 $(MANDIR)/man8
++ install -m 644 man8misc/getunimap.8 $(MANDIR)/man8
+ rm -f $(MANDIR)/man5/keytables.5
+
+ clean:
+diff -Naur kbd-1.10.orig/src/Makefile.in kbd-1.10/src/Makefile.in
+--- kbd-1.10.orig/src/Makefile.in 2004-01-03 17:53:06.000000000 +0000
++++ kbd-1.10/src/Makefile.in 2004-01-07 02:36:44.706655648 +0000
+@@ -46,8 +46,9 @@
+ OLDPROGS= mapscrn loadunimap
+
+ # Not installed by default
+-MISC = screendump setlogcons setvesablank spawn_console spawn_login \
+- getunimap clrunimap outpsfheader setpalette
++#MISC = screendump setlogcons setvesablank spawn_console spawn_login \
++# getunimap clrunimap outpsfheader setpalette
++MISC = setlogcons setvesablank getunimap
+
+ # Installed by default
+ SHCMDS = unicode_start unicode_stop
+@@ -73,7 +74,7 @@
+ install: all
+ install -d -m 0755 $(BINDIR) $(LOADKEYS_BINDIR)
+ install -s -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
+-# install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
++ install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
+ install -c -m 0755 $(setowner) $(SHCMDS) $(BINDIR)
+ for i in psfaddtable psfgettable psfstriptable; do \
+ rm -f $(BINDIR)/$$i; ln -s psfxtable $(BINDIR)/$$i; \
--- /dev/null
+--- slcommon.c.tmp 2006-11-07 22:53:31.000000000 +0000
++++ slcommon.c 2006-11-07 17:56:04.000000000 +0000
+@@ -191,7 +191,7 @@
+ return p;
+ }
+
+-#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if 0
+ extern int __libc_enable_secure;
+ # define HAVE___LIBC_ENABLE_SECURE 1
+ #endif