- leave osfmach3_ppc alone

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index a44c14bb22d2fc62c82211dc229f1ac4aa251adf..8c96b7b6dcfdd4ce09f5c5bb81c5726000a89c27 100644 (file)
--- 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,9 +207,17 @@ 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}} \
 }
 
+# overload to insert debuginfo package
+%prep \
+%if 0%{?_enable_debug_packages}\
+%{debug_package}\
+%endif\
+%%prep\
+%{nil}
+
 # Location of autoconf macros
 %_aclocaldir   %(aclocal --print-ac-dir)
 
@@ -1211,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*}}                                                                                                       \