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

[aigoshin at users.sourceforge.net]

Revision: 11271
          http://gar.svn.sourceforge.net/gar/?rev=11271&view=rev
Author:   aigoshin
Date:     2010-10-12 16:46:03 +0000 (Tue, 12 Oct 2010)

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

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

Added Paths:
-----------
    csw/mgar/pkg/nginx/trunk/files/sunc.diff

Modified: csw/mgar/pkg/nginx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nginx/trunk/Makefile	2010-10-12 15:47:41 UTC (rev 11270)
+++ csw/mgar/pkg/nginx/trunk/Makefile	2010-10-12 16:46:03 UTC (rev 11271)
@@ -25,17 +25,16 @@
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
 
 EXTRA_BUILD_ISAS_i386  = pentium_pro amd64
-EXTRA_BUILD_ISAS_sparc = sparcv9
+EXTRA_BUILD_ISAS_sparc = sparcv8plus sparcv9
 
 NGINXCPU_i386        = pentium
 NGINXCPU_pentium_pro = pentium3
-NGINXCPU_sparcv8     = sparc32
+NGINXCPU_sparcv8     = sparc
+NGINXCPU_sparcv8plus = sparc32
 NGINXCPU_sparcv9     = sparc64
 NGINXCPU_$(ISA)     ?= $(ISA)
 NGINXCPU             = $(NGINXCPU_$(ISA))
 
-CHECKPKG_OVERRIDES_CSWnginx += binary-architecture-does-not-match-placement|file=opt/csw/sbin/sparcv8/nginx|arch_id=18|arch_name=sparcv8+
-
 CFLAGS =
 
 sysconfdir=/etc/opt/csw
@@ -74,6 +73,10 @@
 
 include gar/category.mk
 
+pre-configure-modulated:
+	cd $(WORKSRC)/auto/cc; \
+	gpatch -p $(WORKDIR)/sunc.diff
+
 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

Added: csw/mgar/pkg/nginx/trunk/files/sunc.diff
===================================================================
--- csw/mgar/pkg/nginx/trunk/files/sunc.diff	                        (rev 0)
+++ csw/mgar/pkg/nginx/trunk/files/sunc.diff	2010-10-12 16:46:03 UTC (rev 11271)
@@ -0,0 +1,25 @@
+--- sunc.OLD	Tue Oct 12 18:34:30 2010
++++ sunc	Tue Oct 12 18:35:43 2010
+@@ -37,6 +37,7 @@
+     ngx_amd64="-m64"
+ 
+ else
++    ngx_sparc="-xarch=v8"
+     ngx_sparc32="-xarch=v8plus"
+     ngx_sparc64="-xarch=v9"
+     ngx_amd64="-xarch=amd64"
+@@ -94,6 +95,14 @@
+         CPU_OPT="$CPU_OPT -xcache=64/64/2:1024/64/16"
+     ;;
+ 
++    sparc)
++        # build 32-bit Sparc v8 binary
++        CPU_OPT="$ngx_sparc"
++        CORE_LINK="$CORE_LINK $ngx_sparc"
++        CC_AUX_FLAGS="$CC_AUX_FLAGS $ngx_sparc"
++        NGX_CPU_CACHE_LINE=64
++    ;;
++
+     sparc32)
+         # build 32-bit UltraSparc binary
+         CPU_OPT="$ngx_sparc32"


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