r546 - in x86/branches/utf8: . packages/ncurses

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Aug 3 23:19:02 PDT 2005


Author: alexander
Date: 2005-08-04 00:19:01 -0600 (Thu, 04 Aug 2005)
New Revision: 546

Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/packages/ncurses/Makefile
Log:
[EXPERIMENTAL] replaced ncurses-related compatibility symlinks with ldscripts.


Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-08-03 18:26:11 UTC (rev 545)
+++ x86/branches/utf8/BUGS	2005-08-04 06:19:01 UTC (rev 546)
@@ -4,14 +4,6 @@
   length in bytes and its width in cells are the same; 2) assumption that
   translated strings fit. Possible fix: compile this program with NLS disabled.
 
-ncurses:
-  [SHOWSTOPPER] ldconfig creates /usr/lib/libncursesw.so.5 -> libncurses.so
-  symlink. However, this doesn't lead to miscompilation:
-  /usr/lib/libncursesw.so.5 -> libncurses.so -> libncursesw.co -> 
-  -> ../../libncursesw.so.5 -> libncursesw.so.5.4
-  Possible fix: replace the "libncurses.so -> libncursesw.co" symlink with
-  a linker script.
-
 gpm/kernel:
   In UTF-8 mode, cannot copy/paste non-ASCII characters on the Linux console.
   There is a kernel patch that is supposed to circument this limitation, but it

Modified: x86/branches/utf8/packages/ncurses/Makefile
===================================================================
--- x86/branches/utf8/packages/ncurses/Makefile	2005-08-03 18:26:11 UTC (rev 545)
+++ x86/branches/utf8/packages/ncurses/Makefile	2005-08-04 06:19:01 UTC (rev 546)
@@ -55,13 +55,16 @@
 	 make install && chmod 755 /usr/lib/*.5.4 && \
 	 mv /usr/lib/libncursesw.so.5* /lib && \
 	 ln -sf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so && \
-	 for ext in so a ; do \
-	   for lib in curses ncurses form panel menu ; do \
-	     ln -sf lib$${lib}w.$${ext} /usr/lib/lib$${lib}.$${ext} ; \
-	   done ; \
+	 for lib in curses ncurses form panel menu ; do \
+	  rm -f /usr/lib/lib$${lib}.so ; \
+	  echo "INPUT(-l$${lib}w)" >/usr/lib/lib$${lib}.so ; \
+	  ln -sf lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
 	 done && \
-	 ln -sf libncursesw.so /usr/lib/libcursesw.so && \
-	 ln -sf libncurses.so /usr/lib/libcurses.so ; fi
+	 rm -f /usr/lib/libcursesw.so && \
+	 echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so && \
+	 ln -sf libncurses.so /usr/lib/libcurses.so && \
+	 ln -sf libncursesw.a /usr/lib/libcursesw.a && \
+	 ln -sf libncurses.a /usr/lib/libcurses.a ; fi
 	@make clean
 
 clean:




More information about the livecd mailing list