folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: with --target=i686, pass macro %_arch=i386. 

CVS patchset: 2889
CVS date: 1999/03/13 22:37:47
This commit is contained in:
jbj 1999-03-13 22:37:47 +00:00
parent 40670e2a96
commit a36b1b3871
6 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,4 +1,5 @@
2.91 -> 2.92
- fix: with --target=i686, pass macro %_arch=i386.
- fix: rpm --target=arch ... resurrected.
- fix: rpm -q --specfile --specedit now works even with BuildArch:.

16
configure.in
View File

@ -578,6 +578,22 @@ else
ln -s ${srcdir}/autodeps/none ./find-requires
fi
dnl Determine the canonical arch-vendor-os for the build machine
case "${build_cpu}" in
i[x3456789]86) RPMCANONARCH=i386 ;;
alpha*) RPMCANONARCH=alpha ;;
sparc*) RPMCANONARCH=sparc ;;
*) RPMCANONARCH=unknown ;;
esac
RPMCANONVENDOR="$build_vendor"
case "${build_vendor}" in
unknown) test -f /etc/redhat-release && RPMCANONVENDOR=redhat ;;
esac
RPMCANONOS="$build_os_noversion"
AC_SUBST(RPMCANONARCH)
AC_SUBST(RPMCANONVENDOR)
AC_SUBST(RPMCANONOS)
if test -n "$LIBOBJS" ; then
LIBMISC="$(top_builddir)/misc/libmisc.a"
fi

18
macros.in
View File

@ -37,9 +37,7 @@
# These are the default values that will be overridden by any
# explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
#
%_buildarch Unknown
%_builddir %{_topdir}/BUILD
%_buildos Linux
%_bzip2bin @BZIP2BIN@
%_dbpath %{_var}/lib/rpm
%_defaultdocdir /usr/doc
@ -52,6 +50,14 @@
%_srcrpmdir %{_topdir}/SRPMS
%_tmppath %{_var}/tmp
%_topdir %{_usrsrc}/redhat
#==============================================================================
# ---- rpm per-platform macros.
# Per-platform macros.
%_arch @RPMCANONARCH@
%_vendor @RPMCANONVENDOR@
%_os @RPMCANONOS@
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
#
# XXX use the rpmrc instantiated macro for now
#%optflags -O2
@ -104,10 +110,10 @@
# (Note: Above is the goal, below are the macros under development)
#
# The configure macro does the following:
# optionally change to a subdirectory.
# attempt to update onfig.guess and config.sub.
# optionally change to a subdirectory (not implemented).
# attempt to update config.guess and config.sub.
# run configure with correct prefix, platform, and CFLAGS.
# optionally restore current directory.
# optionally restore current directory (not implemented).
# The configure macro should be invoked as %configure (rather than %{configure})
# because the rest of the arguments will be expanded using %*. Another
# gotcha is that arguments, if present, should be on the same line as the
@ -115,4 +121,4 @@
#
%configure \
%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \
CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix}
CFLAGS="%{optflags}" ../configure %{_target_platform} --prefix=%{_prefix}

2
rpm.spec
View File

@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
Name: rpm
%define version 2.92
Version: %{version}
Release: 6
Release: 7
Group: System Environment/Base
Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/rpm-%{version}.tar.gz
Copyright: GPL

3
scripts/Makefile.in
View File

@ -114,6 +114,9 @@ POSUB = @POSUB@
RANLIB = @RANLIB@
ROOT_GROUP = @ROOT_GROUP@
RPM = @RPM@
RPMCANONARCH = @RPMCANONARCH@
RPMCANONOS = @RPMCANONOS@
RPMCANONVENDOR = @RPMCANONVENDOR@
RPMCONFIGDIR = @RPMCONFIGDIR@
TARGET = @TARGET@
U = @U@

26
tests/macros.in
View File

@ -37,9 +37,7 @@
# These are the default values that will be overridden by any
# explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
#
%_buildarch Unknown
%_builddir %{_topdir}/BUILD
%_buildos Linux
%_bzip2bin @BZIP2BIN@
%_dbpath %{_var}/lib/rpm
%_defaultdocdir /usr/doc
@ -52,6 +50,14 @@
%_srcrpmdir %{_topdir}/SRPMS
%_tmppath %{_var}/tmp
%_topdir %{_usrsrc}/redhat
#==============================================================================
# ---- rpm per-platform macros.
# Per-platform macros.
%_arch @RPMCANONARCH@
%_vendor @RPMCANONVENDOR@
%_os @RPMCANONOS@
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
#
# XXX use the rpmrc instantiated macro for now
#%optflags -O2
@ -93,10 +99,10 @@
%_host_vendor @host_vendor@
%_host_os @host_os@
%_target %{_host}
%_target_alias %{_host_alias)
%_target_cpu %{_host_cpu)
%_target_vendor %{_host_vendor)
%_target_os %{_host_os)
%_target_alias %{_host_alias}
%_target_cpu %{_host_cpu}
%_target_vendor %{_host_vendor}
%_target_os %{_host_os}
#==============================================================================
# ---- specfile macros.
@ -104,10 +110,10 @@
# (Note: Above is the goal, below are the macros under development)
#
# The configure macro does the following:
# optionally change to a subdirectory.
# attempt to update onfig.guess and config.sub.
# optionally change to a subdirectory (not implemented).
# attempt to update config.guess and config.sub.
# run configure with correct prefix, platform, and CFLAGS.
# optionally restore current directory.
# optionally restore current directory (not implemented).
# The configure macro should be invoked as %configure (rather than %{configure})
# because the rest of the arguments will be expanded using %*. Another
# gotcha is that arguments, if present, should be on the same line as the
@ -115,4 +121,4 @@
#
%configure \
%{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \
CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix}
CFLAGS="%{optflags}" ../configure %{_target_platform} --prefix=%{_prefix}