]> git.pld-linux.org Git - packages/rpm.git/blobdiff - rpm.macros
- leave osfmach3_ppc alone
[packages/rpm.git] / rpm.macros
index 4ce8ff9a19ae9e1433c268ff352287d2bfe83abb..8c96b7b6dcfdd4ce09f5c5bb81c5726000a89c27 100644 (file)
@@ -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)
 
@@ -351,8 +364,8 @@ CXXFLAGS="%{rpmcxxflags}" \
 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 \
+               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; \
@@ -366,19 +379,19 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                elfsharedlist=`echo "$filetypes" | awk -F: '/LF.*shared object/ {print $1}'`; \
                archiveslist=`echo "$filetypes" | awk -F: '/current ar archive/ {print $1}'`; \
                if [ -n "$elfexelist" ]; then \
-                       printf "Stripping %d ELF executables..." $(echo -n "$elfexelist" | wc -l); \
+                       printf "Stripping %d ELF executables..." $(echo "$elfexelist" | wc -l); \
                        chmod u+w $elfexelist; \
                        %{__strip} --remove-section=.note --remove-section=.comment $elfexelist; \
                        echo "DONE"; \
                fi; \
                if [ -n "$elfsharedlist" ]; then \
-                       printf "Stripping %d ELF shared libraries..." $(echo -n "$elfsharedlist" | wc -l); \
+                       printf "Stripping %d ELF shared libraries..." $(echo "$elfsharedlist" | wc -l); \
                        chmod u+w $elfsharedlist; \
                        %{__strip} --strip-unneeded --remove-section=.note --remove-section=.comment $elfsharedlist; \
                        echo "DONE"; \
                fi; \
                if [ -n "$archiveslist" ]; then \
-                       printf "Stripping %d ar archives..." $(echo -n "$archiveslist" | 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"; \
@@ -388,19 +401,19 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
     filelist_unneeded=%{?_autostripunneeded:`find $RPM_BUILD_ROOT -type f -regex "%{_autostripunneeded}"`}; \
     filelist_debug=%{?_autostripdebug:`find $RPM_BUILD_ROOT -type f -regex "%{_autostripdebug}"`}; \
        if [ -n "$filelist_all" ]; then \
-               printf "Stripping everything from %d additional files..." $(echo -n "$filelist_all" | wc -l); \
+               printf "Stripping everything from %d additional files..." $(echo "$filelist_all" | wc -l); \
                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 -n "$filelist_unneeded" | wc -l); \
+               printf "Stripping unneeded from %d additional files..." $(echo "$filelist_unneeded" | wc -l); \
                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 -n "$filelist_debug" | wc -l); \
+               printf "Stripping debuginfo from %d additional files..." $(echo "$filelist_debug" | wc -l); \
                chmod u+w $filelist_debug; \
                %{__strip} --strip-debug --remove-section=.note --remove-section=.comment $filelist_debug; \
                echo "DONE"; \
@@ -424,7 +437,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                objs=`echo "$files" | xargs -r -d'\\n' file | awk -F: '/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \
        fi; \
        if [ -n "$objs" ]; then \
-               printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo -n "$objs" | wc -l); \
+               printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \
                echo "$objs" | \
                while read file; do \
                        rpath= ; \
@@ -457,11 +470,13 @@ fi; }; __spec_install_post_chrpath } } }
 %{!?no_install_post_compress_modules: __spec_install_post_compress_modules() { \
        if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
                q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \
-               printf "Compress %d kernel modules..." $(echo -n "$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; \
+               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 } }
 
@@ -1209,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*}}                                                                                                       \
This page took 0.038388 seconds and 4 git commands to generate.