[packages/rpm/rpm.org] - cpu-os-macros are autogenerated here - partial cleaup of install section

baggins baggins at pld-linux.org
Fri Dec 27 15:08:41 CET 2019


commit 2f409bb76d70b5ef73c6090e62da15a3250b4c9a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Dec 27 23:07:49 2019 +0900

    - cpu-os-macros are autogenerated here
    - partial cleaup of install section

 README.cpu-os-macros |  14 --
 cpu-os-macros.a      | 686 ---------------------------------------------------
 rpm.spec             |  86 ++-----
 3 files changed, 26 insertions(+), 760 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 3c079d9..2023c52 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -35,7 +35,7 @@
 %endif
 %define		reqpopt_ver	1.15
 %define		openssl_ver	1.1.1d
-%define		sover		5.4
+%define		sover		9.0.1
 
 Summary:	RPM Package Manager
 Summary(de.UTF-8):	RPM Packet-Manager
@@ -51,9 +51,6 @@ License:	GPL v2 / LGPL v2.1
 Group:		Base
 Source0:	http://ftp.rpm.org/releases/rpm-4.15.x/%{name}-%{version}.tar.bz2
 # Source0-md5:	ed72147451a5ed93b2a48e2f8f5413c3
-# See README.cpu-os-macros how to update cpu-os-macros.a
-Source100:	cpu-os-macros.a
-Source101:	README.cpu-os-macros
 Source1:	%{name}.groups
 Source2:	macros.pld.in
 Source3:	%{name}-install-tree
@@ -668,10 +665,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q -n %{name}-%{version}%{?subver}
-install -d platform
-cd platform
-ar x %{SOURCE100}
-cd -
 
 #patch0 -p1
 %patch1 -p1
@@ -792,44 +785,36 @@ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key
 	pkgconfigdir=%{_pkgconfigdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# install platform macros
-for f in platform/*macros; do
-	bn=${f#*/}
-	fn=${bn%.macros}/macros
-	install -m644 $f -D %{buildroot}%{_rpmlibdir}/$fn
-done
-
 # cleanup
 %ifnarch %{ix86} %{x8664} x32
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/athlon-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i386-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i486-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i586-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/i686-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/pentium3-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/pentium4-linux/macros
 %endif
 
 %ifnarch %{x8664} x32
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/x32-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/amd64-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia32e-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/x32-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/x86_64-linux/macros
 %endif
 
 %ifnarch %{ppc}
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc-linux/macros
 %endif
 
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/alpha*-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/arm*-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia64-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/k6-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/mips*-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc*series-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/ppc64*-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/s390*-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/sparc*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/alpha*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/arm*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ia64-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/mips*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc*series-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/ppc64*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/s390*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/platform/sparc*-linux/macros
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 # first platform file entry can't contain regexps
@@ -924,16 +909,7 @@ EOF
 # Squash Extra Blank Lines
 %{__sed} -i -e '/./,/^$/!d' $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.a
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.la
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-provides
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-requires
-
-# not installed since 4.4.8 (-tools-perl subpackage)
-install scripts/rpmdiff scripts/rpmdiff.cgi $RPM_BUILD_ROOT%{_rpmlibdir}
 
 install %{SOURCE1} doc/manual/groups
 install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
@@ -941,7 +917,7 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
 install %{SOURCE12} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
 install %{SOURCE14} $RPM_BUILD_ROOT%{_rpmlibdir}/java-find-requires
-install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
+#install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 cp -p %{SOURCE25} $RPM_BUILD_ROOT%{_rpmlibdir}/php.req.php
 install %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/mimetypedeps.sh
 install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/hrmib-cache
@@ -968,16 +944,13 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Requirename
 
 install tools/rpmdb_checkversion $RPM_BUILD_ROOT%{_rpmlibdir}/bin
 install tools/rpmdb_reset $RPM_BUILD_ROOT%{_rpmlibdir}/bin
-install %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/bin/dbupgrade.sh
+#install %{SOURCE29} $RPM_BUILD_ROOT%{_rpmlibdir}/bin/dbupgrade.sh
 
 # create macro loading wrappers for backward compatibility
 for m in gstreamer java mono perl php python; do
 	echo "%%{load:%{_rpmlibdir}/macros.d/$m}" >$RPM_BUILD_ROOT%{_rpmlibdir}/macros.$m
 done
 
-# moved to rpm-build-macros 1.699
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.d/kernel
-
 # for rpm -e|-U --repackage
 install -d $RPM_BUILD_ROOT/var/{spool/repackage,lock/rpm}
 touch $RPM_BUILD_ROOT/var/lock/rpm/transaction
@@ -985,27 +958,20 @@ touch $RPM_BUILD_ROOT/var/lock/rpm/transaction
 # move rpm to /bin
 mv $RPM_BUILD_ROOT%{_bindir}/rpm $RPM_BUILD_ROOT/bin
 # move essential libs to /lib (libs that /bin/rpm links to)
-for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so librpmbuild-%{sover}.so librpmmisc-%{sover}.so librpmconstant-%{sover}.so; do
+for a in librpm.so.%{sover} librpmbuild.so.%{sover} librpmio.so.%{sover} librpmsign.so.%{sover}; do
 	mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/%{_lib}
 	ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
-# Bourne shell script vs ELF executable linked with rpm,rpmdb,rpmio
-mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
-
 %if %{with python}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
+#%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
 %endif
 
 # wrong location, not used anyway
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log,xinetd}
-# utils dropped in 5.4 -- their manuals
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rpmgrep.1
-# script obsoleted by /usr/lib/rpm/bin/dbconvert binary
-%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/dbconvert.sh
+%{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log}
 
 %find_lang %{name}
 
diff --git a/README.cpu-os-macros b/README.cpu-os-macros
deleted file mode 100644
index cc27bcb..0000000
--- a/README.cpu-os-macros
+++ /dev/null
@@ -1,14 +0,0 @@
-In order to more easily cope with merges and avoid issues with binary formats,
-we're now using the ar format which will give us a pure ascii archive that'll
-make it possible to track & merge individual changes like with other text files.
-Unfortunately the format doesn't support paths..
-
-recommended way of making changes and updating archive:
-rm -rf foo
-mkdir foo
-cd foo
-ar x ../cpu-os-macros.a
-<perform your changes>
-cd -
-# preserve order of files within the archive
-LC_ALL=C /bin/sh -c 'ar cDr cpu-os-macros.a foo/*macros'
diff --git a/cpu-os-macros.a b/cpu-os-macros.a
deleted file mode 100644
index abeed44..0000000
--- a/cpu-os-macros.a
+++ /dev/null
@@ -1,686 +0,0 @@
-!<arch>
-//                                              708       `
-alpha-linux.macros/
-alphaev5-linux.macros/
-alphaev56-linux.macros/
-alphaev6-linux.macros/
-alphaev67-linux.macros/
-alphapca56-linux.macros/
-amd64-linux.macros/
-armv7l-linux.macros/
-athlon-linux.macros/
-i386-linux.macros/
-i486-linux.macros/
-i586-linux.macros/
-i686-linux.macros/
-ia32e-linux.macros/
-ia64-linux.macros/
-mips-linux.macros/
-mipsel-linux.macros/
-noarch-linux.macros/
-pentium3-linux.macros/
-pentium4-linux.macros/
-ppc-linux.macros/
-ppc64-linux.macros/
-ppc64iseries-linux.macros/
-ppc64pseries-linux.macros/
-ppciseries-linux.macros/
-ppcpseries-linux.macros/
-s390-linux.macros/
-s390x-linux.macros/
-sparc-linux.macros/
-sparc64-linux.macros/
-sparcv9-linux.macros/
-x32-linux.macros/
-x86_64-linux.macros/
-
-/0              0           0     0     644     336       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			alpha
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mieee
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-/20             0           0     0     644     349       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			alphaev5
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mieee -mcpu=ev5
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-/43             0           0     0     644     351       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			alphaev56
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mieee -mcpu=ev56
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-/67             0           0     0     644     349       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			alphaev6
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mieee -mcpu=ev6
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-/90             0           0     0     644     351       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			alphaev67
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mieee -mcpu=ev67
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-/114            0           0     0     644     353       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			alphapca56
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mieee -mcpu=pca56
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-/139            0           0     0     644     726       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			x86_64
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64 -mtune=generic} -march=x86-64 %{!?nospecflags:%{?specflags_x86_64}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib64
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		2
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/159            0           0     0     644     603       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			arm
-%_os			linux
-%_gnu			-gnueabi
-%optflags		-O2 -g -fpic -fPIC -fno-strict-volatile-bitfields
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/180            0           0     0     644     770       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			i386
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=athlon -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_athlon}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/201            0           0     0     644     782       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			i386
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=i386 -mtune=generic -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32:} %{?specflags_i386}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/220            0           0     0     644     766       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			i486
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=i486 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_i486}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/239            0           0     0     644     781       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			i586
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer -mtune=generic}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=i586 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_i586}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/258            0           0     0     644     797       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			i686
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32 -mtune=generic} -march=i686 -fasynchronous-unwind-tables -mtune=pentium4 %{!?nospecflags:%{?specflags_ia32} %{?specflags_i686}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/277            0           0     0     644     725       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			x86_64
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64 -mtune=generic} -march=x86-64 %{!?nospecflags:%{?specflags_ia32e}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib64
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		2
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/297            0           0     0     644     387       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ia64
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags:%{__common_cflags}}%{!?__common_cflags:-O2 -g}
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-k6-linux.macros/0           0     0     644     708       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			i386
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=k6 -fasynchronous-unwind-tables
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/316            0           0     0     644     634       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			mips
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags:%{__common_cflags} -march=mips3}%{!?__common_cflags:-O2 -g -m32}
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/335            0           0     0     644     654       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			mipsel
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags:%{__common_cflags} -march=mips3 -mtune=loongson2f}%{!?__common_cflags:-O2 -g -m32}
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/356            0           0     0     644     541       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			noarch
-%_os			linux
-%_gnu			-gnu
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/377            0           0     0     644     778       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			pentium3
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=pentium3 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_pentium3}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/400            0           0     0     644     778       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			pentium4
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fomit-frame-pointer}%{!?__common_cflags_with_ssp:-O2 -g -m32} -march=pentium4 -fasynchronous-unwind-tables %{!?nospecflags:%{?specflags_ia32} %{?specflags_pentium4}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/423            0           0     0     644     609       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ppc
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -m32 -fsigned-char %{!?nospecflags:%{?specflags_ppc}}} 
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/441            0           0     0     644     579       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ppc64
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -m64 -mminimal-toc
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib64
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		2
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/461            0           0     0     644     332       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ppc64iseries
-%_os			linux
-%_gnu			-gnu
-%optflags		-g
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-/488            0           0     0     644     332       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ppc64pseries
-%_os			linux
-%_gnu			-gnu
-%optflags		-g
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-/515            0           0     0     644     348       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ppciseries
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mminimal-toc
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-/540            0           0     0     644     348       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			ppcpseries
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -mminimal-toc
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-/565            0           0     0     644     562       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			s390
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -m31
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/584            0           0     0     644     565       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			s390x
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -m64
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib64
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		2
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-/604            0           0     0     644     590       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			sparc
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -m32 -mcpu=v7 -mtune=ultrasparc
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/624            0           0     0     644     584       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			sparc64
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -m64 -mcpu=ultrasparc
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib64
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		2
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/646            0           0     0     644     580       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			sparc
-%_os			linux
-%_gnu			-gnu
-%optflags		-O2 -g -m32 -mcpu=ultrasparc
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		1
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-/668            0           0     0     644     1091      `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			x32
-%_os			linux
-%_gnu			-gnux32
-%_target_platform	x86_64-%{_target_vendor}-%{_target_os}%{?_gnu}
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g} -mtune=generic -march=x86-64 %{!?nospecflags:%{?specflags_x32}}
-
-#==============================================================================
-# ---- x86_64 cross-compilation macros.
-#__cc			x86_64-pld-linux-gcc -mx32
-#__cpp			x86_64-pld-linux-gcc -mx32 -E
-#__cxx			x86_64-pld-linux-g++ -mx32
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			libx32
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		3
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
-# ---- 0x1 - x86, 0x2 - x86_64 (rpm default), 0x4 - x32
-%_prefer_color		0x4
-
-/686            0           0     0     644     725       `
-# Per-platform rpm configuration file.
-
-#==============================================================================
-# ---- per-platform macros.
-#
-%_arch			x86_64
-%_os			linux
-%_gnu			-gnu
-%optflags		%{?__common_cflags_with_ssp:%{__common_cflags_with_ssp} -fPIC}%{!?__common_cflags_with_ssp:-O2 -g -m64 -mtune=generic} -march=x86-64 %{!?nospecflags:%{?specflags_x86_64}}
-
-#==============================================================================
-# ---- configure macros.
-#
-%_lib			lib64
-
-#---------------------------------------------------------------------
-#	Multilibs
-%_multilibno		3
-%_multilibpatt		(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list