[csw-devel] SF.net SVN: gar:[11276] csw/mgar/pkg/nginx/trunk/Makefile

[aigoshin at users.sourceforge.net]

Revision: 11276
          http://gar.svn.sourceforge.net/gar/?rev=11276&view=rev
Author:   aigoshin
Date:     2010-10-12 19:18:40 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
nginx: package release 20101012

Modified Paths:
--------------
    csw/mgar/pkg/nginx/trunk/Makefile

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2010-10-12 19:01:44 UTC (rev 11275)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2010-10-12 19:18:40 UTC (rev 11276)
@@ -11,8 +11,8 @@
 endef
 
 MASTER_SITES = http://sysoev.ru/nginx/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += cswnginx sunc.diff
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES   += cswnginx
 
 LICENSE = LICENSE
 
@@ -24,16 +24,26 @@
 PACKAGING_PLATFORMS  = solaris9-sparc  solaris9-i386
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
+# default sparc arch is set to sparcv8plus because nginx contains
+# assembler parts specific to v8plus and v9 arches:
+#	.inline ngx_casa,0
+#	casa    [%o2] 0x80, %o1, %o0
+#	.end
+#
+#	.inline ngx_casxa,0
+#	casxa   [%o2] 0x80, %o1, %o0
+#	.end
+
+ISA_DEFAULT_sparc      = sparcv8plus
 EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
-EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9
+EXTRA_BUILD_ISAS_sparc = sparcv9
 
-NGINXCPU_i386        = pentium
-NGINXCPU_pentium_pro = pentium3
-NGINXCPU_sparcv8     = sparc
-NGINXCPU_sparcv8plus = sparc32
-NGINXCPU_sparcv9     = sparc64
-NGINXCPU_$(ISA)     ?= $(ISA)
-NGINXCPU             = $(NGINXCPU_$(ISA))
+NGINXCPU_i386          = pentium
+NGINXCPU_pentium_pro   = pentium3
+NGINXCPU_sparcv8plus   = sparc32
+NGINXCPU_sparcv9       = sparc64
+NGINXCPU_$(ISA)       ?= $(ISA)
+NGINXCPU               = $(NGINXCPU_$(ISA))
 
 CFLAGS =
 
@@ -73,10 +83,6 @@
 
 include gar/category.mk
 
-pre-configure-modulated:
-	gpatch -d $(WORKSRC)/auto/cc -i ../../../../../../$(WORKDIR)/sunc.diff
-	$(MAKECOOKIE)
-
 post-configure-modulated:
 	gsed -i  s#/...ISALIST#/'$$ISALIST'# $(WORKSRC)/objs/ngx_auto_config.h
 	gsed -i 's#  pause#  rep; nop#'      $(WORKSRC)/src/os/unix/ngx_sunpro_amd64.il


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.