Refactor ncurses installation to build only the wide version and update readline patch to use ncursesw with proper linker flags

Author: cxzhong

build/pkgs/ncurses/spkg-install.in

@@ -7,40 +7,9 @@ fi
 
 cd src
 
-# Ncurses cannot build narrow and wide (unicode, --enable-widec)
-# versions in one go. Need to compile twice. Note that Python's curses
-# module will want the wide version, and readline the narrow version.
-
-###################################################
-mkdir narrow
-cd narrow
-ln -s ../configure .
-
-echo "Configuring ncurses (narrow)..."
-sdh_configure --with-termlib \
-              --with-shared \
-              --without-normal \
-              --without-ada \
-              --disable-rpath-hack \
-              --enable-overwrite \
-              --with-pkg-config-libdir="$SAGE_LOCAL/lib/pkgconfig" \
-              --enable-pc-files \
-              --without-cxx \
-              --without-cxx-binding \
-              "$DEBUG_CONFIGURE_FLAG"
-
-echo "Building ncurses (narrow)..."
-sdh_make
-
-echo "Installing ncurses (narrow)..."
-sdh_make_install
-
-cd ..  # leave narrow
-
-###################################################
-mkdir wide
-cd wide
-ln -s ../configure .
+# Build only the wide (unicode, --enable-widec) version of ncurses.
+# Python's curses module wants the wide version.
+# Readline should also work with wide version via compatibility symlinks.
 
 echo "Configuring ncurses (wide)..."
 sdh_configure --with-termlib \
@@ -49,6 +18,7 @@ sdh_configure --with-termlib \
               --without-normal \
               --without-ada \
               --disable-rpath-hack \
+              --enable-overwrite \
               --with-pkg-config-libdir="$SAGE_LOCAL/lib/pkgconfig" \
               --enable-pc-files \
               --without-cxx \
@@ -61,7 +31,4 @@ sdh_make
 echo "Installing ncurses (wide)..."
 sdh_make_install
 
-cd ..  # leave wide
-
 # Note: Symbolic links for compatibility are created in spkg-postinst
-# after the files have been moved to their final location.

build/pkgs/readline/patches/0002-ltinfo.patch

@@ -5,11 +5,11 @@
  SHOBJ_LDFLAGS=
  SHOBJ_XLDFLAGS=
 -SHOBJ_LIBS=
-+SHOBJ_LIBS='$(TERMCAP_LIB)'
++SHOBJ_LIBS='-Wl,--no-as-needed -lncursesw -Wl,--as-needed'
 
  SHLIB_XLDFLAGS=
 -SHLIB_LIBS=
-+SHLIB_LIBS='$(TERMCAP_LIB)'
++SHLIB_LIBS='-Wl,--no-as-needed -lncursesw -Wl,--as-needed'
 
  SHLIB_DOT='.'
  SHLIB_LIBPREF='lib'
@@ -18,7 +18,7 @@
  	esac
 
 -	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
-+	SHLIB_LIBS='$(TERMCAP_LIB)'
++	SHLIB_LIBS='-Wl,--no-as-needed -lncursesw -Wl,--as-needed'
  	;;
 
  openbsd*|netbsd*|mirbsd*)