common Makefile.common,1.74,1.75

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18450

Modified Files:
	Makefile.common 
Log Message:
add build direct to secondary arch hubs and add geode to list of known archs



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/common/Makefile.common,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile.common	7 Aug 2007 19:48:20 -0000	1.74
+++ Makefile.common	17 Aug 2007 03:46:48 -0000	1.75
@@ -29,6 +29,7 @@
 
 BUILD_FLAGS ?=  $(shell echo $(KOJI_FLAGS))
 
+
 ## a base directory where we'll put as much temporary working stuff as we can
 ifndef WORKDIR
 WORKDIR := $(shell pwd)
@@ -94,6 +95,15 @@
 # would be nicer to autodetermine from the spec file...
 RPM_BUILD_DIR ?= $(BUILDDIR)/$(NAME)-$(VERSION)
 
+## for secondary arch only packages we cant build on the primary hub
+## we need to go direct to the secondary arch hub
+define secondary-arch 
+for name in elftoaout silo prtconf lssbus afbinit xorg-x11-drv-sunbw2 xorg-x11-drv-suncg14 xorg-x11-drv-suncg3 xorg-x11-drv-suncg6 xorg-x11-drv-sunffb xorg-x11-drv-sunleo xorg-x11-drv-suntcx ; \
+do if [ "$$name" = "$(NAME)" ]; then echo "-c ~/.koji/sparc-config"; fi \
+done 
+endef
+SECONDARY_CONFIG := $(shell $(secondary-arch))
+
 # default target: just make sure we've got the sources
 all: sources
 
@@ -148,7 +158,7 @@
 endef
 
 # list the possible targets for valid arches
-ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips
+ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pseries iseries ppc64iseries athlon alpha alphaev6 sparc sparc64 sparcv9 sparcv9v sparc64v i164 mac sh mips geode
 
 # for the modules that do different "make prep" depending on what arch we build for
 PREP_ARCHES	= $(addprefix prep-,$(ARCHES))
@@ -401,7 +411,7 @@
 
 koji: build-check $(COMMON_DIR)/branches
 	@if [ ! -x "$(BUILD_CLIENT)" ]; then echo "Must have koji installed - see http://fedoraproject.org/wiki/BuildSystemClientSetup"; exit 1; fi
-	@$(BUILD_CLIENT) build $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
+	@$(BUILD_CLIENT) $(SECONDARY_CONFIG) build $(BUILD_FLAGS) $(TARGET) '$(CVS_URL)'
 
 ifneq (, $(filter devel F-7 OLPC-2, $(BRANCH)))
 build: koji