Browse Source

Stefan Paletta:


			
			
				rocklinux
			
			
		
Stefan Paletta 18 years ago
parent
commit
8276fd81f1
2 changed files with 55 additions and 7 deletions
  1. +37
    -7
      package/base/ncurses/ncurses.conf
  2. +18
    -0
      package/base/ncurses/no-rm-so.patch

+ 37
- 7
package/base/ncurses/ncurses.conf

@ -20,10 +20,18 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
prefix=''
set_confopt
libdir=$root/lib
includedir=$includedir/ncurses
custmain=ncurses_main
var_append extraconfopt ' ' '--with-shared'
if pkginstalled libtool && [ ${stagelevel} -gt 3 ] ; then
var_append extraconfopt ' ' '--with-libtool'
else
var_append extraconfopt ' ' '--with-normal'
fi
confopt="$confopt --with-normal --with-shared"
prepatch="bunzip2 < $archdir/termtypes.ti.bz2 > misc/terminfo.src"
remove_include_termcap() {
@ -31,22 +39,44 @@ remove_include_termcap() {
sed -i 's,termcap.h,,g' include/Makefile
}
if [ -f $root/var/adm/packages/termcap ] ; then
if pkginstalled termcap ; then
echo_status "Found termcap package ->" \
"disable ncurses internal termcap library."
confopt="$confopt --disable-termcap"
var_append extraconfopt ' ' '--disable-termcap'
inmake="remove_include_termcap"
else
hook_add postmake 6 "\
ln -svf libncurses.a $libdir/libtermcap.a; \
ln -svf libncurses.so $libdir/libtermcap.so"
hook_add postmake 8 "\
ln -svf ncurses/termcap.h $includedir/../"
fi
hook_add postmake 7 "\
ln -svf libncurses.so $libdir/libcurses.so; \
ln -svf libncurses.a $libdir/libcurses.a"
ln -svf libncurses.a $libdir/libcurses.a; \
ln -svf ncurses/curses.h ncurses/term.h ncurses/unctrl.h $includedir/../"
if [ $stagelevel = 1 ] ; then
var_append confopt ' ' '--without-cxx --without-cxx-bindings'
var_append extraconfopt ' ' '--without-cxx --without-cxx-bindings'
fi
var_append makeinstopt ' ' "'INSTALL_LIB=\$(INSTALL) -m 755'"
ncurses_main() {
ncurses_build
eval "$MAKE distclean"
var_append extraconfopt ' ' '--enable-widec'
includedir=${includedir}w
ncurses_build
}
ncurses_build() {
hook_eval preconf
eval_config_command $( eval echo $confopt )
hook_eval premake
eval "$MAKE $makeopt"
hook_eval inmake
eval "$MAKE $makeinstopt"
hook_eval postmake
}

+ 18
- 0
package/base/ncurses/no-rm-so.patch

@ -0,0 +1,18 @@
--- ./mk-1st.awk.orig 2005-06-18 21:15:57.000000000 +0200
+++ ./mk-1st.awk 2006-05-30 01:48:45.556155823 +0200
@@ -207,7 +207,6 @@
} else {
dst_dirs = "$(DESTDIR)$(libdir)";
printf "../lib/%s : $(%s_OBJS)\n", end_name, OBJS
- print "\t-@rm -f $@";
}
if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(TINFO_LIST) $(LDFLAGS)\n", OBJS
@@ -240,7 +239,6 @@
src_name = sprintf("../lib/%s", end_name);
dst_name = sprintf("$(DESTDIR)$(libdir)/%s", end_name);
printf "\t@echo installing %s as %s\n", src_name, dst_name
- printf "\t-@rm -f %s\n", dst_name
printf "\t$(INSTALL_LIB) %s %s\n", src_name, dst_name
sharedlinks("$(DESTDIR)$(libdir)")

Loading…
Cancel
Save