X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.macros;h=8c96b7b6dcfdd4ce09f5c5bb81c5726000a89c27;hp=82efc0a19390469f49b6ad0476655f2cc325fadd;hb=426239d2311a1574e962f94071456ab8f4139c2b;hpb=4de081192c4d2e288f6e547f8a7b00c8589fb4d7

diff --git a/rpm.macros b/rpm.macros
index 82efc0a..8c96b7b 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -8,6 +8,8 @@
 %kgcc		%{__cc}
 %kgcc_package	gcc
 
+%__rm			/bin/rm --interactive=never
+
 # Build system path macros.
 #
 %__autoconf		autoconf %{?debug:-Wall}
@@ -32,6 +34,9 @@
 %__intltoolize		intltoolize --copy --force
 %__libtoolize		libtoolize --copy --force
 
+#	Path to top of build area.
+%_topdir		%(test -d ../SPECS && (cd ..; pwd) || echo $HOME/rpm)
+
 #	The number of cvs changelog entries kept when building package.
 %_buildchangelogtruncate 20
 
@@ -173,7 +178,7 @@ CXXFLAGS="%{rpmcxxflags}" \
 }
 
 #----------------------------------------------------------------
-%global configure_cache 0
+#%configure_cache 0
 %configure_cache_file	%{buildroot}.configure.cache
 
 %configure {./configure \
@@ -202,41 +207,15 @@ CXXFLAGS="%{rpmcxxflags}" \
 	--infodir=%{_infodir} \
 	--x-libraries=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
 	%{dependencytracking} \
-	%{?configure_cache:--cache-file=%{configure_cache_file:-%{buildroot}.configure.cache}} \
+	%{?configure_cache:--cache-file=%{configure_cache_file}} \
 }
 
-# ------------------------------------------------------------------------
-# Overloading of some basic macros
+# overload to insert debuginfo package
 %prep \
-%%prep\
-export LC_ALL=C\
-export LANG=C\
-unset LINGUAS ||:\
-unset LANGUAGE ||:\
-unset LC_MESSAGES ||:\
-unset DISPLAY ||:\
-%{nil}
-
-%build %%build\
-export LC_ALL=C\
-export LANG=C\
-unset LINGUAS ||:\
-unset LANGUAGE ||:\
-unset LC_MESSAGES ||:\
-unset DISPLAY ||:\
-%{nil}
-
-%install \
 %if 0%{?_enable_debug_packages}\
-%{?buildsubdir:%{debug_package}}\
+%{debug_package}\
 %endif\
-%%install\
-export LC_ALL=C\
-export LANG=C\
-unset LINGUAS ||:\
-unset LANGUAGE ||:\
-unset LC_MESSAGES ||:\
-unset DISPLAY ||:\
+%%prep\
 %{nil}
 
 # Location of autoconf macros
@@ -373,26 +352,32 @@ unset DISPLAY ||:\
 #
 # Requires: find, awk, strip, cut, xargs
 #
-#%no_install_post_strip	1
+# Special macros which affect this process:
+#%no_install_post_strip	1		# disable stripping at all
+#%_noautostrip			regexp	# exclude files matching (anchored!) regex from stripping
+#%_autostripall			regexp	# strip files matching (anchored!) regex using plain strip
+#%_autostripunneeded	regexp	# strip files matching (anchored!) regex using strip --strip-unneeded
+#%_autostripdebug		regexp	# strip files matching (anchored!) regex using strip --strip-debug
+#
 %__spec_install_post_strip {%{!?debug: \
 %{!?no_install_post_strip:__spec_install_post_strip() { \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
 	if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
 		modulelist=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \
-		modulecount=$(echo -n "$modulelist" | wc -l); \
-		if [ "$modulecount" -gt 0 ]; then \
-			printf "Stripping %d kernel modules..."; \
+		if [ "$modulelist" ]; then \
+			modulecount=$(echo "$modulelist" | wc -l); \
+			printf "Stripping %d kernel modules..." $modulecount; \
 			echo "$modulelist" | xargs -l512 chmod u+w; \
 			echo "$modulelist" | xargs -l512 %{__strip} --strip-unneeded --remove-section=.comment --remove-section=.note.GNU-stack; \
 			echo "DONE"; \
 		fi; \
 	fi; \
-	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"} %{?_autostripall:! -regex "%{_autostripall}"} %{?_autostripunneeded:! -regex "%{_autostripunneeded}"} %{?_autostripdebug:! -regex "%{_autostripdebug}"}`; \
+	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*/lib/modules/.*" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"} %{?_autostripall:! -regex "%{_autostripall}"} %{?_autostripunneeded:! -regex "%{_autostripunneeded}"} %{?_autostripdebug:! -regex "%{_autostripdebug}"}`; \
 	if [ -n "$filelist" ]; then \
 		filetypes=`echo "$filelist" | xargs -r -d'\\n' file`; \
 		elfexelist=`echo "$filetypes" | awk -F: '/ELF.*executable/ {print $1}'`; \
 		elfsharedlist=`echo "$filetypes" | awk -F: '/LF.*shared object/ {print $1}'`; \
-		archiveslist=`echo "$filetypes" | awk -F '/current ar archive/ {print $1}'`; \
+		archiveslist=`echo "$filetypes" | awk -F: '/current ar archive/ {print $1}'`; \
 		if [ -n "$elfexelist" ]; then \
 			printf "Stripping %d ELF executables..." $(echo "$elfexelist" | wc -l); \
 			chmod u+w $elfexelist; \
@@ -406,7 +391,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
 			echo "DONE"; \
 		fi; \
 		if [ -n "$archiveslist" ]; then \
-			printf "Stripping %d ar archives..." $(echo "$elfsharedlist" | wc -l); \
+			printf "Stripping %d ar archives..." $(echo "$archiveslist" | wc -l); \
 			chmod u+w $archiveslist; \
 			%{__strip} --strip-debug --remove-section=.note --remove-section=.comment $archiveslist; \
 			echo "DONE"; \
@@ -417,19 +402,19 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
     filelist_debug=%{?_autostripdebug:`find $RPM_BUILD_ROOT -type f -regex "%{_autostripdebug}"`}; \
 	if [ -n "$filelist_all" ]; then \
 		printf "Stripping everything from %d additional files..." $(echo "$filelist_all" | wc -l); \
-		chmod u+w $elfexelist; \
+		chmod u+w $filelist_all; \
 		%{__strip} --remove-section=.note --remove-section=.comment $filelist_all; \
 		echo "DONE"; \
 	fi; \
 	if [ -n "$filelist_unneeded" ]; then \
 		printf "Stripping unneeded from %d additional files..." $(echo "$filelist_unneeded" | wc -l); \
-		chmod u+w $elfsharedlist; \
+		chmod u+w $filelist_unneeded; \
 		%{__strip} --strip-unneeded --remove-section=.note --remove-section=.comment $filelist_unneeded; \
 		echo "DONE"; \
 	fi; \
 	if [ -n "$filelist_debug" ]; then \
 		printf "Stripping debuginfo from %d additional files..." $(echo "$filelist_debug" | wc -l); \
-		chmod u+w $archiveslist; \
+		chmod u+w $filelist_debug; \
 		%{__strip} --strip-debug --remove-section=.note --remove-section=.comment $filelist_debug; \
 		echo "DONE"; \
 	fi; \
@@ -440,15 +425,17 @@ fi; }; __spec_install_post_strip } } }
 #
 # Requires: find, awk, cut, xargs, chrpath, uname
 #
-#%no_install_post_chrpath	1
+# Special macros which affect this process
+#%no_install_post_chrpath	1	# disable chrpath at all
+#%_noautochrpath	regex		# exclude files matching (anchored!) regex from chrpath
+#
 %__spec_install_post_chrpath {%{!?debug: \
 %{!?no_install_post_chrpath: __spec_install_post_chrpath() { \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
-	files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*"  %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \
+	files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*/lib/modules/.*" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \
 	if [ -n "$files" ]; then \
 		objs=`echo "$files" | xargs -r -d'\\n' file | awk -F: '/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \
-	fi
-	#"
+	fi; \
 	if [ -n "$objs" ]; then \
 		printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \
 		echo "$objs" | \
@@ -482,12 +469,14 @@ fi; }; __spec_install_post_chrpath } } }
 %__spec_install_post_compress_modules { \
 %{!?no_install_post_compress_modules: __spec_install_post_compress_modules() { \
 	if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
-		echo "Compress kernel modules"; \
 		q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \
-		echo "$q" | xargs -r %{__gzip} -9nf; \
-		printf "%d modules compressed\n" $(echo "$q" | wc -l); \
-		find $RPM_BUILD_ROOT/lib/modules -name '*o' -type l -printf "%p %l\n" | \
-		while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done; \
+		if [ "$q" ]; then \
+			printf "Compress %d kernel modules..." $(echo "$q" | wc -l); \
+			echo "$q" | xargs -r %{__gzip} -9nf; \
+			echo "DONE"; \
+			find $RPM_BUILD_ROOT/lib/modules -name '*o' -type l -printf "%p %l\n" | \
+			while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done; \
+		fi; \
 	fi; \
 }; __spec_install_post_compress_modules } }
 
@@ -802,7 +791,12 @@ fi; \
 # -e   - send to stderr instead of stdout
 # -n   - no show banner (overrides -t)
 # -t   - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5
-%banner(aent:)	\
+#
+# Tests:
+# (rpm -E '%banner -e banner <<EOF'; echo -e 'hi\nEOF') > m; sh -x m
+# rpm -E 'date | %banner -e banner' > m; sh -x m
+#
+%banner(aent:) ( \
 RPM_SCRIPTVERBOSITY=5 \
 [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 if [ -x /usr/bin/banner.sh ]; then \
@@ -810,8 +804,8 @@ if [ -x /usr/bin/banner.sh ]; then \
 else \
 	CMD="cat%{-e: >&2}" \
 fi \
-eval $CMD %2%{?3: %3} \
-%nil
+eval $CMD %{?2:%2}%{?3: %3}) \
+%{nil}
 
 # useradd/groupadd macros
 # Author: Elan Ruusamäe <glen@pld-linux.org>
@@ -1230,14 +1224,14 @@ done \
 %define Opts 														\\\\\\\
 %if "%{_target_base_arch}" != "%{_arch}"							\\\
 	%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"	\\\
-	CC="%{__cc}" CPP="%{__cpp}" ARCH=%{_target_base_arch}			\\\
+	CC="%{kgcc}" ARCH=%{_target_base_arch}							\\\
 	%else															\\\
 	ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
 	%endif															\\\
 %else																\\\
-	CC="%{__cc}" CPP="%{__cpp}"										\\\
+	CC="%{kgcc}" 													\\\
 %endif																\
-%define	MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
+%define	MakeOpts HOSTCC="%{kgcc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
 		O=$PWD/o %{?with_verbose:V=1} %{Opts}						\
 																	\
 %{?-C:cd %{-C*}}													\
@@ -1254,13 +1248,6 @@ for cfg in ${cfgs:-dist}; do                                        \
 	ln -sf %{_kernelsrcdir}/config-$cfg o/.config					\
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers	\
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h \
-%ifarch ppc ppc64													\
-	install -d o/include/asm										\
-	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \
-	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \
-%else																\
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm \
-%endif																\
 																	\
 	set +x															\
 	[ -z "$PATCH_SH" ] || echo "$PATCH_SH" | %__spec_build_shell	\