common Makefile.common,1.127,1.128
Bill Nottingham
notting at fedoraproject.org
Fri May 29 01:46:31 UTC 2009
Author: notting
Update of /cvs/extras/common
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2038
Modified Files:
Makefile.common
Log Message:
Don't try to special-case noarch - this breaks badly with noarch subpackages. (infrastructure #1412)
Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- Makefile.common 15 Apr 2009 04:57:41 -0000 1.127
+++ Makefile.common 29 May 2009 01:45:59 -0000 1.128
@@ -35,7 +35,7 @@ DIST_DEFINES = --define "dist $(DIST)" -
BUILD_FLAGS ?= $(KOJI_FLAGS)
-LOCALARCH := $(if $(shell grep -i '^BuildArch:.*noarch' $(SPECFILE)), noarch, $(shell uname -m))
+LOCALARCH := $(shell rpm --eval %{_arch})
## a base directory where we'll put as much temporary working stuff as we can
ifndef WORKDIR
More information about the scm-commits
mailing list