X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=e7cc33cb1773a7b12a71e7c30ae51c338172676c;hb=d68708d13fa5e28142a4edf58a8fd491cb85b72d;hp=da42ecd01a9751a369e008566feaa2698102b516;hpb=a99596a95a1d8e0999128c8544eee12f0cec8075;p=packages%2Frpm.git diff --git a/rpm.macros b/rpm.macros index da42ecd..e7cc33c 100644 --- a/rpm.macros +++ b/rpm.macros @@ -14,12 +14,16 @@ %debugcflags -O0 -g -Wall %rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags} -%rpmldflags %{!?debug:-s} +# %rpmldflags %{!?debug:-s} +%rpmldflags %{nil} # kernel compiler %kgcc gcc %kgcc_package gcc +# other macros +%_enable_debug_packages 1 + # Build system path macros. # %__libtoolize libtoolize --copy --force @@ -49,8 +53,8 @@ CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \ CPPFLAGS="${CPPFLAGS:-}" ; export CPPFLAGS ; \ - %{?__cc:CC=%{__cc} ; export CC ; } \ - %{?__cxx:CXX=%{__cxx} ; export CXX ; } \ + %{?__cc:CC="%{__cc}" ; export CC ; } \ + %{?__cxx:CXX="%{__cxx}" ; export CXX ; } \ %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \ --host=%{_target_platform} \ --prefix=%{_prefix} \ @@ -76,8 +80,8 @@ CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \ FFLAGS="${FFLAGS:-%rpmcflags}" \ CPPFLAGS="${CPPFLAGS:-}" \ - %{?__cc:CC=%{__cc}} \ - %{?__cxx:CXX=%{__cxx}} \ + %{?__cc:CC="%{__cc}"} \ + %{?__cxx:CXX="%{__cxx}"} \ --build=%{_target_platform} \ --prefix=%{_prefix} \ --exec-prefix=%{_exec_prefix} \ @@ -95,6 +99,28 @@ --x-libraries=/usr/X11R6/%{_lib} \ } +# ------------------------------------------------------------------------ +# Overloading of some basic macros +%prep \ +%%prep\ +LANG=C\ +export LANG\ +unset DISPLAY ||:\ +%{nil} + +%build %%build\ +LANG=C\ +export LANG\ +unset DISPLAY ||:\ +%{nil} + +%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\ +%%install\ +LANG=C\ +export LANG\ +unset DISPLAY ||:\ +%{nil} + # ------------------------------------------------------------------------ # Conditional build stuff. @@ -187,13 +213,13 @@ %requires_releq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %requires_releq_kernel_up() %(LC_ALL="C" rpm -qf --qf 'Prereq: kernel-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -vE "(is not|no such)") %requires_releq_kernel_smp() %(LC_ALL="C" rpm -qf --qf 'Prereq: kernel-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -vE "(is not|no such)") -%requires_eq_to %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +%requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR) # kernel version-release handling -%__kernel_ver %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2) -%__kernel_rel %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/version.h --queryformat "%{RELEASE}" | grep -v "is not") +%__kernel_ver %([ -f %{_kernelsrcdir}/include/linux/version.h ] && (grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2) || (awk '/^VERSION/ { ver = $0; gsub(/VERSION.*=/, NIL, ver); } /^PATCHLEVEL/ { plev = $0; gsub(/PATCHLEVEL.*=/, NIL, plev); } /^SUBLEVEL/ { slev = $0; gsub(/SUBLEVEL.*=/, NIL, slev); } END { printf("%d.%d.%d", ver, plev, slev); }' %{_kernelsrcdir}/Makefile 2> /dev/null)) +%__kernel_rel %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h --queryformat "%{RELEASE}" | grep -v "is not") %_kernel_ver %(echo %{__kernel_ver}%{!?_without_dist_kernel:-%{__kernel_rel}}) %_kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g) @@ -222,8 +248,8 @@ # #%no_install_post_compress_docs 1 %__spec_install_post_compress_docs { \ -echo "Compress man and info pages."; \ %{!?no_install_post_compress_docs: \ + echo "Compress man and info pages."; \ %{?verbose:set -x;} \ for i in /usr/share/man /usr/X11R6/man /usr/share/info; do \ if [ -d "$RPM_BUILD_ROOT$i" ]; then \ @@ -242,9 +268,10 @@ echo "Compress man and info pages."; \ #%no_install_post_strip 1 %__spec_install_post_strip {%{!?debug: \ %{!?no_install_post_strip: \ - %{?verbose:set -x;} \ + %{?verbose:set -x;} \ + if [ -d "$RPM_BUILD_ROOT" ]; then \ echo "Strip executable binaries, archives and shared object files."; \ - filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*"`; \ + filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \ elfexelist=`echo $filelist | xargs -r file | \ awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \ elfsharedlist=`echo $filelist | xargs -r file | \ @@ -252,14 +279,15 @@ echo "Compress man and info pages."; \ elfarchiveslist=`echo $filelist | xargs -r file | \ awk '/current ar archive/ {print $1}' | cut -d: -f1`; \ if [ -n "$elfexelist" ]; then \ - strip --remove-section=.note --remove-section=.comment $elfexelist; \ + %{__strip} --remove-section=.note --remove-section=.comment $elfexelist; \ fi; \ if [ -n "$elfsharedlist" ]; then \ - strip --strip-unneeded --remove-section=.note --remove-section=.comment $elfsharedlist; \ + %{__strip} --strip-unneeded --remove-section=.note --remove-section=.comment $elfsharedlist; \ fi; \ if [ -n "$elfarchiveslist" ]; then \ - strip --strip-debug --remove-section=.note --remove-section=.comment $elfarchiveslist; \ - fi; } \ + %{__strip} --strip-debug --remove-section=.note --remove-section=.comment $elfarchiveslist; \ + fi; \ + fi; } \ } } #----------------------------------------------------------------- # remove all RPATH from executable binaries and shared object files @@ -270,8 +298,9 @@ echo "Compress man and info pages."; \ %__spec_install_post_chrpath {%{!?debug: \ %{!?no_install_post_chrpath: \ %{?verbose:set -x;} \ +if [ -d "$RPM_BUILD_ROOT" ]; then \ echo "Remove RPATH from executable binaries and shared object files."; \ -find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" | xargs -r file | \ +find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"} | xargs -r file | \ awk '/ELF.*(executable|shared object)/ {print $1}' | cut -d: -f1 | \ while read file ; do \ rpath= ; \ @@ -290,7 +319,8 @@ while read file ; do \ done ; \ if [ "$rpath" = "" ] ; then chrpath -d "$file" > /dev/null ; \ else chrpath -r "$rpath" "$file" > /dev/null ; fi ; \ -done; } \ +done; \ +fi; } \ } } #----------------------------------------------------------------- # Find and gzip all kernel modules @@ -300,14 +330,16 @@ done; } \ #%no_install_post_compress_modules 1 %__spec_install_post_compress_modules { \ %{!?no_install_post_compress_modules: \ -echo "Compress kernel modules if any."; \ %{?verbose:set -x;} \ + if [ -d "$RPM_BUILD_ROOT" ]; then \ +echo "Compress kernel modules if any."; \ if test -d $RPM_BUILD_ROOT/lib/modules ; then \ find $RPM_BUILD_ROOT/lib/modules -name \*o -type f -print | \ xargs -r %{__gzip} -9nf; \ 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; \ } } %_source_payload w9.gzdio @@ -411,3 +443,4 @@ fi; \ %xmms_effect_plugindir %(xmms-config --effect-plugin-dir) %xmms_general_plugindir %(xmms-config --general-plugin-dir) +%_target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/')