reverted (hopefully all) lib/*.{a.la} - > usr/lib/ changes and replaced

the code with a post-flist solution which works more package independet
and allows the adaption of the .la files

PARTIALLY TESTED - PLEASE REVIEW!


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

Documentation/Developers/CHANGELOG-RENE

@@ -5,6 +5,9 @@
  - Andreas V. Meier: added avm/aalib
  - Sebastian Jaenicke: updated courier-imap and maildrop
  - Dimitar Zhekov: fixed xfree86-cyrillic-fonts 
+ - reverted (hopefully all) lib/*.{a.la} - > usr/lib/ changes and replaced
+   the code with a post-flist solution which works more package independet
+   and allows the adaption of the .la files
 
 *) 2003-09-30 (2.0.0-rc1 - 2.0.0-rc2)
 

package/base/e2fsprogs/modify_before_install.patch

@@ -1,123 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/e2fsprogs/modify_before_install.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-chmod and ranlib before install because install_wrapper moves the file
-to an 'unknown' location.
-
- -Alejandro
-
---- ./lib/et/Makefile.in.orig	2003-09-19 16:37:15.000000000 -0400
-+++ ./lib/et/Makefile.in	2003-09-19 16:38:14.000000000 -0400
-@@ -86,10 +86,10 @@
- 		$(DESTDIR)$(man3dir)
- 
- install:: compile_et libcom_err.a $(HFILES) installdirs
-+	$(CHMOD) 644 libcom_err.a
-+	-$(RANLIB) libcom_err.a
-+	$(CHMOD) $(LIBMODE) libcom_err.a
- 	$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
--	$(CHMOD) 644 $(DESTDIR)$(libdir)/libcom_err.a
--	-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
--	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
- 	for i in $(HFILES); do \
- 		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
- 	done
---- ./lib/ss/Makefile.in.orig	2003-09-19 16:48:25.000000000 -0400
-+++ ./lib/ss/Makefile.in	2003-09-19 16:49:04.000000000 -0400
-@@ -135,10 +135,10 @@
- 		$(DESTDIR)$(bindir)
- 
- install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds
-+	$(CHMOD) 644 libss.a
-+	-$(RANLIB) libss.a
-+	$(CHMOD) $(LIBMODE) libss.a
- 	$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
--	$(CHMOD) 644 $(DESTDIR)$(libdir)/libss.a
--	-$(RANLIB) $(DESTDIR)$(libdir)/libss.a
--	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
- 	$(RM) -f $(DESTDIR)$(includedir)/ss/*
- 	for i in $(INSTALL_HFILES); do \
- 		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
---- ./lib/e2p/Makefile.in.orig	2003-09-19 16:57:37.000000000 -0400
-+++ ./lib/e2p/Makefile.in	2003-09-19 16:58:51.000000000 -0400
-@@ -75,10 +75,10 @@
- 		$(DESTDIR)$(includedir)/e2p
- 
- install:: all installdirs 
-+	$(CHMOD) 644 libe2p.a
-+	-$(RANLIB) libe2p.a
-+	$(CHMOD) $(LIBMODE) libe2p.a
- 	$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
--	$(CHMOD) 644 $(DESTDIR)$(libdir)/libe2p.a
--	-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
--	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
- 	set -e; for i in $(HFILES); do \
- 	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \
- 	done
---- ./lib/ext2fs/Makefile.in.orig	2003-09-19 17:09:05.000000000 -0400
-+++ ./lib/ext2fs/Makefile.in	2003-09-19 17:09:43.000000000 -0400
-@@ -222,10 +222,10 @@
- 		$(DESTDIR)$(includedir)/ext2fs
- 
- install:: all $(HFILES) $(HFILES_IN) installdirs 
-+	$(CHMOD) 644 libext2fs.a
-+	-$(RANLIB) libext2fs.a
-+	$(CHMOD) $(LIBMODE) libext2fs.a
- 	$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
--	$(CHMOD) 644 $(DESTDIR)$(libdir)/libext2fs.a
--	-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
--	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
- 	for i in $(HFILES); do \
- 		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
- 	done
---- ./lib/uuid/Makefile.in.orig	2003-09-19 17:19:09.000000000 -0400
-+++ ./lib/uuid/Makefile.in	2003-09-19 17:19:42.000000000 -0400
-@@ -129,10 +129,10 @@
- 		$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir)
- 
- install:: all installdirs 
-+	$(CHMOD) 644 libuuid.a
-+	-$(RANLIB) libuuid.a
-+	$(CHMOD) $(LIBMODE) libuuid.a
- 	$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
--	$(CHMOD) 644 $(DESTDIR)$(libdir)/libuuid.a
--	-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
--	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
- 	$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
- 	$(INSTALL_DATA) uuid_types.h $(DESTDIR)$(includedir)/uuid/uuid_types.h
- 	for i in $(SMANPAGES); do \
---- ./lib/blkid/Makefile.in.orig	2003-09-19 17:25:29.000000000 -0400
-+++ ./lib/blkid/Makefile.in	2003-09-19 17:26:22.000000000 -0400
-@@ -112,10 +112,10 @@
- 		$(DESTDIR)$(includedir)/blkid
- 
- install:: all installdirs 
-+	$(CHMOD) 644 libblkid.a
-+	-$(RANLIB) libblkid.a
-+	$(CHMOD) $(LIBMODE) libblkid.a
- 	$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
--	$(CHMOD) 644 $(DESTDIR)$(libdir)/libblkid.a
--	-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
--	$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
- 	set -e; for i in $(HFILES); do \
- 	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
- 	done

package/base/libtool/statics_at_usr_lib.patch

@@ -1,52 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/libtool/statics_at_usr_lib.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-if destdir is /lib, static lib could had been moved to /usr/lib by 
-INSTALL_WRAPPER
-
- - Alejandro
---- ./ltmain.sh.orig	2003-09-19 12:43:07.000000000 -0400
-+++ ./ltmain.sh	2003-09-19 12:44:25.000000000 -0400
-@@ -5630,6 +5630,10 @@
-       $show "$install_prog $file $oldlib"
-       $run eval "$install_prog \$file \$oldlib" || exit $?
- 
-+      if [ "$destdir" == "/lib" -a ! -f "$oldlib" ]; then
-+        oldlib="/usr/lib/$name"
-+      fi
-+
-       if test -n "$stripme" && test -n "$striplib"; then
- 	$show "$old_striplib $oldlib"
- 	$run eval "$old_striplib $oldlib" || exit $?
---- ./libltdl/ltmain.sh.orig	2003-09-19 12:43:07.000000000 -0400
-+++ ./libltdl/ltmain.sh	2003-09-19 12:44:25.000000000 -0400
-@@ -5630,6 +5630,10 @@
-       $show "$install_prog $file $oldlib"
-       $run eval "$install_prog \$file \$oldlib" || exit $?
- 
-+      if [ "$destdir" == "/lib" -a ! -f "$oldlib" ]; then
-+        oldlib="/usr/lib/$name"
-+      fi
-+
-       if test -n "$stripme" && test -n "$striplib"; then
- 	$show "$old_striplib $oldlib"
- 	$run eval "$old_striplib $oldlib" || exit $?

package/base/ncurses/ranlib_before_install.patch

@@ -1,40 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/ncurses/ranlib_before_install.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./mk-1st.awk.orig	2003-09-18 19:21:49.000000000 -0400
-+++ ./mk-1st.awk	2003-09-18 19:26:25.000000000 -0400
-@@ -306,6 +306,7 @@
- 				print  "install.libs \\"
- 				printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name
- 				printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
-+				printf "\t$(RANLIB) ../lib/%s\n", lib_name
- 				printf "\t$(INSTALL_DATA) ../lib/%s $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name
- 				if ( overwrite == "yes" && lib_name == "libncurses.a" )
- 				{
-@@ -313,7 +314,6 @@
- 					printf "\t-@rm -f $(DESTDIR)$(libdir)/libcurses.a\n"
- 					printf "\t(cd $(DESTDIR)$(libdir) && $(LN_S) libncurses.a libcurses.a)\n"
- 				}
--				printf "\t$(RANLIB) $(DESTDIR)$(libdir)/%s\n", lib_name
- 				if ( target == "vxworks" )
- 				{
- 					printf "\t@echo installing ../lib/lib%s.o as $(DESTDIR)$(libdir)/lib%s.o\n", name, name

package/base/shadow/shadow.conf

@@ -36,8 +36,8 @@ pm_shadow() {
 }
 
 preconf="pc_shadow"
-
 postmake="pm_shadow"
 
 confopt="$confopt --enable-shared --disable-desrpc"
 libdir="$root/lib"
+

scripts/Build-Pkg

@@ -239,9 +239,6 @@ fi
 export INSTALL_WRAPPER_LOGFILE="$builddir/install_wrapper.log"
 export CMD_WRAPPER_LOGFILE="$builddir/cmd_wrapper.log"
 
-var_append INSTALL_WRAPPER_FILTER '|' \
-	'sed -e "s,^'$root'/lib/\(.*\.\(a\|la\)\),'$root'/usr/lib/\1,"'
-
 if [ $norebuild = 1 -a -f $root/var/adm/logs/$stagelevel-$xpkg.log ] ; then
 	echo_pkg_deny $stagelevel $pkg "already built"
 	exit 0
@@ -411,6 +408,7 @@ postflist=""    ; hook_add postflist    5 'eval "$postflist"'
 finish=""	; hook_add finish	5 'eval "$finish"'
 
 [ "$ROCKCFG_DO_CHECK" = 1 ] && hook_add inmake 6 'run_check'
+hook_add postflist 3 'postflist_static_lib'
 
 configprefix=""	; autogen=0
 configscript="./configure" ; extraconfopt=""

scripts/functions

@@ -269,6 +269,25 @@ function run_check() {
 	fi
 }
 
+# move the static libs from lib to usr/lib and correct the libdir used
+# inside the .la file
+#
+postflist_static_lib() {
+	echo_status "processing static lib corrections ..."
+	egrep '^lib/.*\.(a|la)$' $builddir/flist.txt |
+	while read fn ; do
+		[ -f $root/$fn ] || continue
+		if [[ $fn = *.a ]] ; then
+			mv -fv $root/$fn $root/usr/$fn
+		else
+			sed "s,^libdir='\(.*\)',libdir='/usr\1'," \
+				$root/$fn > $root/usr/$fn
+			rm $root/$fn
+		fi
+		add_flist $root/usr/$fn
+	done
+}
+
 # Parse the *.desc file. Use the description from PKG-DESC-FORMAT and
 # save the tag data in $desc_*.
 #