diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 0b300e652..3d6f2340a 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -5,6 +5,8 @@ fixed reroot in makeimages.sh disable lilo test4 / pseudo.b updated xmms + some explicit --enable-shared --disable-static overwrites + tiny cleanups / fixes - removed alsa-xmms (since xmms now includes a ALSA plugin) *) 2003-09-24 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/base/binutils/binutils.conf b/package/base/binutils/binutils.conf index 408c66caa..070bd4b89 100644 --- a/package/base/binutils/binutils.conf +++ b/package/base/binutils/binutils.conf @@ -30,6 +30,9 @@ if [ $stagelevel -eq 0 ]; then custmain="binutils_stage0" else preconf="mkdir -p objdir ; cd objdir" ; configscript="../configure" - [ $stagelevel -gt 2 ] && postmake="eval $MAKE info install-info" + if [ $stagelevel -gt 2 ] ; then + var_remove confopt " " "--disable-static" + postmake="eval $MAKE info install-info" + fi fi diff --git a/package/base/gdb/gdb.conf b/package/base/gdb/gdb.conf index fd73c8b84..6727ece19 100644 --- a/package/base/gdb/gdb.conf +++ b/package/base/gdb/gdb.conf @@ -20,7 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - # flistdel="$flistdel|usr/include/ansidecl.h|usr/lib/libiberty.a|"\ # "usr/lib/libopcodes.a|usr/include/readline/readline.h|"\ # "usr/include/bfd.h|usr/lib/libbfd.a|usr/lib/libreadline.a|"\ @@ -30,8 +29,7 @@ # "usr/lib/libhistory.a|usr/share/info/history.info|"\ # "usr/share/info/readline.info|usr/share/man/man3/readline.3" -# preconf="gunzip < $archdir/gdb-4.18-$ver.diff.bz2 | patch -Nbfp2" -# srctar="gdb-4.18.tar.bz2" ; srcdir="gdb-4.18" - +var_remove confopt " " "--enable-shared" +var_remove confopt " " "--disable-static" inmake="eval $MAKE -C gdb/doc install-info" diff --git a/package/base/liblockfile/force-symlink.patch b/package/base/liblockfile/force-symlink.patch new file mode 100644 index 000000000..e90c2eab4 --- /dev/null +++ b/package/base/liblockfile/force-symlink.patch @@ -0,0 +1,11 @@ +--- ./Makefile.in.orig 2001-03-17 06:08:33.000000000 +0200 ++++ ./Makefile.in 2003-08-19 21:03:58.000000000 +0300 +@@ -55,7 +55,7 @@ + install_shared: shared install_common + install -m 755 liblockfile.so \ + $(ROOT)$(libdir)/liblockfile.so.$(VER) +- ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so ++ ln -sf liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so + if test "$(ROOT)" = ""; then @LDCONFIG@; fi + + install_common:diff -Nru3 trunk-1418/package/base/gdb/gdb.conf trunk/package/base/gdb/gdb.conf diff --git a/package/base/ncurses/one-step-install.patch b/package/base/ncurses/one-step-install.patch new file mode 100644 index 000000000..368651cb1 --- /dev/null +++ b/package/base/ncurses/one-step-install.patch @@ -0,0 +1,12 @@ +--- ./mk-1st.awk.orig 2002-04-20 20:32:47.000000000 +0300 ++++ ./mk-1st.awk 2003-09-22 16:15:38.000000000 +0300 +@@ -224,8 +224,7 @@ + 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 ++ printf "\trm -f %s; $(INSTALL_LIB) %s %s\n", dst_name, src_name, dst_name + + sharedlinks("$(DESTDIR)$(libdir)") + diff -Nru3 trunk-1418/package/base/liblockfile/force-symlink.patch trunk/package/base/liblockfile/force-symlink.patch diff --git a/package/base/readline/readline.conf b/package/base/readline/readline.conf index d602f57d5..d7e598a17 100644 --- a/package/base/readline/readline.conf +++ b/package/base/readline/readline.conf @@ -22,10 +22,15 @@ readline_postmake() { - rm -f $root/usr/lib/libreadline.so* $root/usr/lib/libhistory.so* + rm -fv $root/usr/lib/lib{readline,history}.so* eval $MAKE shared ; eval $MAKE install-shared - cp -r doc/ examples/ $docdir + if [ "$ROCKCFG_PKG_BASH_INST_RLL" = 1 ] ; then + echo "readline libraries may be needed by bash, moving them ..." + mv -fv $root/usr/lib/lib{readline,history}.* $root/lib + fi + cp -rv examples/ $docdir } +var_remove confopt " " "--disable-static" postmake=readline_postmake