Slang und Newt gepatcht um den Installer endlich in UTF8 zu betreiben.

[people/pmueller/ipfire-2.x.git] / lfs / slang

diff --git a/lfs/slang b/lfs/slang
index 0cb9c18c720876473a62648c5a14cbb5391824d1..210f0d94538a7a4a05e028e197dc19e8cfab2b59 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 2.0.6
+VER        = 1.4.9
 
 THISAPP    = slang-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = efb055000636f312d5c3de56f3c70d12
+$(DL_FILE)_MD5 = 4fbb1a7f1257e065ca830deefe13d350
 
 install : $(TARGET)
 
@@ -76,17 +76,24 @@ $(subst %,%_MD5,$(objects)) :
 $(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/slang-debian-utf8.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-utf8-acs.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.5-utf8-segv.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-utf8-fix.patch
 ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/slang-1.4.9-uclibc.patch
        cd $(DIR_APP) && ./configure --prefix=""
-       cd $(DIR_APP)/src && patch < $(DIR_SRC)/src/patches/slang-$(VER)-uclibc.patch
        cd $(DIR_APP)/src && make
        cd $(DIR_APP)/src && make install DESTDIR="/opt/$(MACHINE)-uClibc"
+       ln -sf libslang-utf8.a /opt/$(MACHINE)-uClibc/lib/libslang.a
 else
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make elf
+       perl -p -i -e 's/(ELF_CFLAGS=\"[^\"]*)-O2([^\"]*\".*)/$1'"$(CFLAGS)"' $2/gs' configure
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make elf all
        cd $(DIR_APP) && make install-elf
-       cd $(DIR_APP) && chmod -v 755 /usr/lib/libslang.so.2.0.6
+       ln -sf libslang-utf8.so.1.4.9 /usr/lib/libslang-utf8.so.1
+       ln -sf libslang-utf8.so /usr/lib/libslang.so
+       ln -sf libslang-utf8.a /usr/lib/libslang.a
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)