- python: put rpmmodule.so where python expects to find.

- add brp-strip-static-archive build root policy helper.
- add -lelf to rpm LDFLAGS, not LDADD, since there is no libelf.la now.

CVS patchset: 6001
CVS date: 2003/01/08 21:37:01

2 files changed, 15 insertions, 2 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0daa39bf3..bf71819e1 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = \
 	brp-compress brp-redhat brp-strip brp-strip-comment-note \
-	brp-strip-shared brp-sparc64-linux \
+	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
 	check-files check-prereqs convertrpmrc.sh cross-build \
 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
 	cpanflute cpanflute2 Specfile.pm find-provides.perl \
@@ -24,7 +24,7 @@ all:
 configdir = ${prefix}/lib/rpm
 config_SCRIPTS = \
 	brp-compress brp-redhat brp-strip brp-strip-comment-note \
-	brp-strip-shared brp-sparc64-linux \
+	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
 	check-files check-prereqs convertrpmrc.sh cross-build \
 	find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
 	cpanflute cpanflute2 Specfile.pm find-provides.perl \
diff --git a/scripts/brp-strip-static-archive b/scripts/brp-strip-static-archive
new file mode 100755
index 000000000..683123952
--- /dev/null
+++ b/scripts/brp-strip-static-archive
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+	exit 0
+fi
+
+# Strip static libraries.
+for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \
+        grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \
+	grep 'current ar archive' | \
+	sed -n -e 's/^\(.*\):[ 	]*current ar archive/\1/p'`; do
+	strip -g $f
+done