[packages/rpm/rpm.org] - require rpm-pld-macros packages instead of packaging global (build)macros andd rpmrc here

baggins baggins at pld-linux.org
Tue Jan 7 07:48:59 CET 2020


commit 3de8e4a9367bb745f9735935c600dde8adb358bc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jan 6 19:40:41 2020 +0900

    - require rpm-pld-macros packages instead of packaging global (build)macros andd rpmrc here

 macros.pld | 178 -------------------------------------------------------------
 rpm.spec   |   9 ++--
 rpmrc.pld  |  76 --------------------------
 3 files changed, 3 insertions(+), 260 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 742bd08..8e7b519 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -41,7 +41,6 @@ Group:		Base
 Source0:	http://ftp.rpm.org/releases/rpm-4.15.x/%{name}-%{version}.tar.bz2
 # Source0-md5:	ed72147451a5ed93b2a48e2f8f5413c3
 Source1:	%{name}.groups
-Source2:	macros.pld
 Source3:	%{name}-install-tree
 Source5:	%{name}-hrmib-cache
 Source6:	%{name}-groups-po.awk
@@ -124,6 +123,7 @@ BuildRequires:	tetex-pdftex
 Requires(posttrans):	coreutils
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-lib = %{epoch}:%{version}-%{release}
+Requires:	rpm-pld-macros >= 1.744
 Requires:	FHS >= 3.0-2
 Requires:	openssl >= %{openssl_ver}
 Requires:	popt >= %{reqpopt_ver}
@@ -345,8 +345,8 @@ Summary(uk.UTF-8):	Скрипти та утиліти, необхідні для
 Group:		Applications/File
 Requires(pretrans):	coreutils
 Requires(pretrans):	findutils
-Requires:	%{name}-build-macros >= 1.712
 Requires:	%{name}-utils = %{epoch}:%{version}-%{release}
+Requires:	rpm-pld-macros-build >= 1.744
 Requires:	/bin/id
 Requires:	awk
 Requires:	bzip2
@@ -732,8 +732,6 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/sparc*-linux/macros
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
 
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/pld
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_rpmlibdir}/pld/macros
-cp -p %{SOURCE32} $RPM_BUILD_ROOT%{_rpmlibdir}/pld/rpmrc
 
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
 cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
@@ -886,8 +884,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/platform/sparc*
 %endif
 
-%{_rpmlibdir}/pld/macros
-%{_rpmlibdir}/pld/rpmrc
+%dir %{_rpmlibdir}/pld
 
 %attr(755,root,root) %{_rpmlibdir}/hrmib-cache
 
diff --git a/macros.pld b/macros.pld
deleted file mode 100644
index 19e9641..0000000
--- a/macros.pld
+++ /dev/null
@@ -1,178 +0,0 @@
-# PLD Linux rpm macros
-# vim:ft=spec
-
-%distribution	PLD Linux
-%vendor		pld
-%bugurl		http://bugs.pld-linux.org/
-%disturl	http://www.pld-linux.org/
-%pld_release	th
-%disttag	%{pld_release}
-
-#==============================================================================
-# ---- configure macros.  note that most of these are inherited
-#      from the defaults.
-#
-%_sharedstatedir	/var/lib
-%_localstatedir		/var
-%_initrddir		%{_sysconfdir}/rc.d/init.d
-
-%_defaultdocdir		%{_usr}/share/doc
-
-%_fmoddir		%{_libdir}/gfortran/modules
-
-# Executed at after copying %doc to DOCDIR, with $DOCDIR set
-%__compress_doc		%{_rpmconfigdir}/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
-
-%__os_install_post \
-%{__spec_install_post_strip}\
-%{__spec_install_post_chrpath}\
-%{__spec_install_post_compress_modules}\
-%{__spec_install_post_check_so}\
-%{__spec_install_post_check_tmpfiles}\
-%{__spec_install_post_check_shebangs}\
-%{__spec_install_post_compress_docs}\
-%{__spec_install_post_py_hardlink}\
-%{__spec_install_post_perl_clean}\
-%{__arch_install_post}\
-%{nil}
-
-%__spec_install_post\
-%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\
-%{__arch_install_post}\
-%{__os_install_post}\
-%{nil}
-
-#---------------------------------------------------------------------
-#	Template for debug information sub-package.
-%_enable_debug_packages		1
-
-%debug_package \
-%ifnarch noarch\
-%global __debug_package 1\
-%package debuginfo\
-Summary: Debug information for package %{name}\
-Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
-Group: Development/Debug\
-Requires: filesystem-debuginfo >= 3.0-16\
-AutoReqProv: 0\
-%description debuginfo\
-This package provides debug information for package %{name}.\
-Debug information is useful when developing applications that use this\
-package or when debugging this package.\
-%description debuginfo -l pl.UTF-8\
-Ten pakiet dostarcza informacje dla debuggera dla pakietu %{name}.\
-Informacje te są przydatne przy rozwijaniu aplikacji używających tego\
-pakietu oraz przy odpluskwianiu samego pakietu.\
-%files debuginfo -f debugfiles.list\
-%defattr(-,root,root)\
-%endif\
-%{nil}
-
-#---------------------------------------------------------------------
-# Overwrite RPM macros with PLD specific one here.
-
-%__find			/usr/bin/find
-%__lua			%{_bindir}/lua
-%__rc			%{_bindir}/rc
-%__xar			%{_bindir}/xar
-
-%_tmppath		%(echo "${TMPDIR:-/var/tmp}")
-%tmpdir			%{_tmppath}
-
-%_topdir		%(echo $HOME)/rpm
-
-%buildroot		%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
-
-%_source_payload	w9.gzdio
-%_binary_payload	w6.xzdio
-
-%_rpmfc_magic_path	/usr/share/file/magic
-
-# provides don't obsolete
-%_upgrade_tag		name
-
-# Disable automatic dependencies on symlinks for now (debuginfo packages pull too many deps)
-%_check_symlink_deps    0 
- 
-# Do not generate executable() dependencies for scriptlets,
-# as it may give false positives, for example:
-# [ ! -x /bin/prog ] || /bin/prog
-# will generate R:/bin/prog and we don't want that as /bin/prog is optional in this case
-# 0 - Use external generator
-# 1 - Use internal generator if available
-# 2 - Use __scriptlet_requires to process scriptlet dependencies
-%_use_internal_dependency_generator	1
-
-%_duplicate_files_terminate_build	1
-%_files_listed_twice_terminate_build	1
-%_unpackaged_files_terminate_build	0
-%_unpackaged_subdirs_terminate_build	0
-
-#
-# Export package NEVRA (stamped with install tid) info for HRMIB on this path.
-#
-# XXX	Note: escaped %% for use in headerSprintf()
-%_hrmib_path	/var/cache/hrmib/%{___NVRA}
-
-#-----------------------------------------------------------------
-# CFLAGS and LDFLAGS used to build
-
-%debuginfocflags	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-4 -fno-debug-types-section -fvar-tracking-assignments -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
-# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
-
-%debugcflags	-O0 -g -Wall
-%debugcppflags	%{nil}
-%debugldflags	%{nil}
-
-%optldflags	-Wl,--as-needed -Wl,--no-copy-dt-needed-entries -Wl,-z,relro -Wl,-z,combreloc
-%optcppflags	%{nil}
-
-# Warning: those macros are overwritten by macros.build,
-#          left here for compatibility
-%rpmcflags %(awk 'BEGIN {
-       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
-       split("%{?filterout} %{?filterout_c} %{?filterout_ld}",F);
-       %{filter_out}
-}')
-%rpmcppflags       %(awk 'BEGIN {
-       split("%{?debug:%debugcppflags}%{!?debug:%optcppflags}%{?debuginfocppflags}",I);
-       split("%{?filterout} %{?filterout_cpp} %{?filterout_cpp}",F);
-       %{filter_out}
-}')
-%rpmcxxflags       %(awk 'BEGIN {
-       split("%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}",I);
-       split("%{?filterout} %{?filterout_cxx} %{?filterout_ld}",F);
-       %{filter_out}
-}')
-%rpmldflags        %(awk 'BEGIN {
-       split("%{?optldflags}",I);
-       split("%{?filterout_ld}",F)
-       %{filter_out}
-}')
-
-# common compilation flags
-%_fortify_cflags	-Wp,-D_FORTIFY_SOURCE=2
-
-# cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
-%Werror_cflags		-Wformat -Werror=format-security
-
-# Use -Werror=trampolines to prevent GCC from generating code that require executable stack
-%_ssp_cflags		-fstack-protector-strong --param=ssp-buffer-size=4 -Werror=trampolines
-%__common_cflags	-O2 -fwrapv -pipe %{Werror_cflags} %{debuginfocflags} %{?_fortify_cflags} %{!?nospecflags:%{?specflags}}
-%__common_cflags_with_ssp	%{__common_cflags} %{?_ssp_cflags}
-
-# arch macros
-%ix86  i386 i486 i586 i686 pentium3 pentium4 athlon geode
-%x8664 x86_64 amd64 ia32e
-%ppc   ppc ppc7400 ppc7450
-
-# avoid fdatasync syscall flood during database operations.
-%__nofsync	nofsync
-
-#---------------------------------------------------------------------
-#	Expanded at end of %prep
-#
-%__chown_Rhf	%{__chown} -Rhf
-%__chgrp_Rhf	%{__chgrp} -Rhf
-%_fixowner	[ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
-%_fixgroup	[ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} root
diff --git a/rpmrc.pld b/rpmrc.pld
deleted file mode 100644
index 44f765b..0000000
--- a/rpmrc.pld
+++ /dev/null
@@ -1,76 +0,0 @@
-include: /usr/lib/rpm/rpmrc
-
-#############################################################
-# Values for RPM_OPT_FLAGS for various platforms
-
-optflags: alpha %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -mieee %{!?nospecflags:%{?specflags_alpha}}
-optflags: alphaev5 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -mieee -mcpu=ev5 %{!?nospecflags:%{?specflags_alpha} %{?specflags_alphaev5}}
-optflags: alphaev56 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -mieee -mcpu=ev56 %{!?nospecflags:%{?specflags_alpha} %{?specflags_alphaev56}}
-optflags: alphaev6 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -mieee -mcpu=ev6 %{!?nospecflags:%{?specflags_alpha} %{?specflags_alphaev6}}
-optflags: alphaev67 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -mieee -mcpu=ev67 %{!?nospecflags:%{?specflags_alpha} %{?specflags_alphaev67}}
-optflags: alphapca56 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -mieee -mcpu=pca56 %{!?nospecflags:%{?specflags_alpha} %{?specflags_alphapca56}}
-
-optflags: aarch64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} %{!?nospecflags:%{?specflags_aarch64}}
-optflags: riscv64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=rv64imafdc -mabi=lp64d %{!?nospecflags:%{?specflags_riscv64}}
-
-optflags: armv6j %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=armv6j -mfpu=vfp -mfloat-abi=hard %{!?nospecflags:%{?specflags_arm} %{?specflags_arm6j}}
-optflags: armv7l %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 %{!?nospecflags:%{?specflags_arm} %{?specflags_arm7l}}
-optflags: armv7hl %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=armv7-a -mfloat-abi=hard %{!?nospecflags:%{?specflags_arm} %{?specflags_arm7hl}}
-optflags: armv7hnl %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} %{?!_disable_neon:-mfpu=neon-vfpv4} -march=armv7-a -mfloat-abi=hard %{!?nospecflags:%{?specflags_arm} %{?specflags_arm7hnl}}
-optflags: armv8l %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=armv8-a -mfloat-abi=softfp -mfpu=vfpv3-d16 %{!?nospecflags:%{?specflags_arm} %{?specflags_arm8l}}
-optflags: armv8hl %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=armv8-a -mfloat-abi=hard %{!?nospecflags:%{?specflags_arm} %{?specflags_arm8hl}}
-optflags: armv8hnl %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} %{?!_disable_neon:-mfpu=neon-vfpv4} -march=armv8-a -mfloat-abi=hard %{!?nospecflags:%{?specflags_arm} %{?specflags_arm8hnl}}
-optflags: armv8hcnl %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} %{?!_disable_neon:-mfpu=neon-vfpv4} -march=armv8-a+crypto -mfloat-abi=hard %{!?nospecflags:%{?specflags_arm} %{?specflags_arm8hcnl}}
-
-ooptflags: athlon %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=athlon -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_athlon}}
-ooptflags: geode %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=geode -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_geode}}
-ooptflags: i386 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=i386 -mtune=generic -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32:} %{?specflags_i386}}
-ooptflags: i486 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=i486 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_i486}}
-ooptflags: i586 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer -mtune=generic}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=i586 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_i586}}
-ooptflags: i686 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32 -mtune=generic} %{?!_disable_lto:-flto} -march=i686 -fasynchronous-unwind-tables -mtune=pentium4 %{!?nospecflags:%{?specflags_ia32} %{?specflags_i686}}
-ooptflags: pentium3 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=pentium3 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_pentium3}}
-ooptflags: pentium4 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} %{?!_disable_lto:-flto} -march=pentium4 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_pentium4}}
-
-ooptflags: ia64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} %{!?nospecflags:%{?specflags_ia64}}
-
-ooptflags: mips %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=mips3 %{!?nospecflags:%{?specflags_mips}}
-ooptflags: mipsel %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -march=mips3 -mtune=loongson2f %{!?nospecflags:%{?specflags_mipsel}}
-
-ooptflags: ppc64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m64 -mminimal-toc %{!?nospecflags:%{?specflags_ppc64}}} 
-ooptflags: ppc64iseries %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m64 -mminimal-toc %{!?nospecflags:%{?specflags_ppc64}}} 
-ooptflags: ppc64pseries %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m64 -mminimal-toc %{!?nospecflags:%{?specflags_ppc64}}} 
-ooptflags: ppc %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m32 -fsigned-char %{!?nospecflags:%{?specflags_ppc}}} 
-ooptflags: ppciseries %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m32 %{!?nospecflags:%{?specflags_ppc}}} 
-ooptflags: ppcpseries %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m32 %{!?nospecflags:%{?specflags_ppc}}} 
-
-ooptflags: s390 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m31 %{!?nospecflags:%{?specflags_s390}}
-ooptflags: s390x %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} %{?!_disable_lto:-flto} -m64 %{!?nospecflags:%{?specflags_s390x}}
-
-ooptflags: sparc %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} -m32 -mcpu=v7 -mtune=ultrasparc %{!?nospecflags:%{?specflags_sparc}}
-ooptflags: sparcv9 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} -m32 -mcpu=ultrasparc %{!?nospecflags:%{?specflags_sparc}}
-ooptflags: sparc64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} -m64 -mcpu=ultrasparc %{!?nospecflags:%{?specflags_sparc64}}
-
-ooptflags: x32 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -mx32} %{?!_disable_lto:-flto} -mtune=generic -march=x86-64 %{!?nospecflags:%{?specflags_x32}}
-
-ooptflags: amd64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64} %{?!_disable_lto:-flto} -march=x86-64 -mtune=generic %{!?nospecflags:%{?specflags_x86_64}}
-ooptflags: ia32e %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64} %{?!_disable_lto:-flto} -march=x86-64 -mtune=generic %{!?nospecflags:%{?specflags_x86_64}}
-ooptflags: x86_64 %{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64} %{?!_disable_lto:-flto} -march=x86-64 -mtune=generic %{!?nospecflags:%{?specflags_x86_64}}
-
-#############################################################
-# For a given uname().machine, the default build arch
-
-buildarchtranslate: athlon: i686
-buildarchtranslate: geode: i686
-buildarchtranslate: i386: i686
-buildarchtranslate: i486: i686
-buildarchtranslate: i586: i686
-buildarchtranslate: pentium3: i686
-buildarchtranslate: pentium4: i686
-
-buildarchtranslate: amd64: x86_64
-buildarchtranslate: ia32e: x86_64
-
-buildarchtranslate: armv7hl: armv7hnl
-buildarchtranslate: armv8hl: armv7hnl
-buildarchtranslate: armv8hnl: armv7hnl
-buildarchtranslate: armv8hcnl: armv7hnl
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/faba01ebbf1071bc705f600bf50bb523c4d07740



More information about the pld-cvs-commit mailing list