Dimitar Zhekov <jimmy@is-vn.bg>:

binutils.conf: ignore --disable-static, *.a required by
ksymoops at least.

gdb.conf: ignore --enable-shared and --disable-static,
gdb linking is buggy (I reported that years ago).

liblockfile/force-symlink.patch: force the liblockfile.so
symlink, or it fails on stage 9.

ncurses/one-step-install.patch: use one shell command to
remove the old .so libraries and install the new ones,
for ncurses.so may be required by bash.

readline.conf: after the shared libraries have been
installed, and if bash is supposed to require them, move
them from /usr/lib to /lib. Please don't change this code
(except for moving the shared libraries only into /lib),
the event flow is tricky and can be easily broken.

readline.conf: don't copy doc to docdir, auto-doc-copy
does it better. But copy the examples, they are a nice
readline.info completion.


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1498 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

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)

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
 

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"
 

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

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

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