SF.net SVN: gar:[26155] csw/mgar/pkg/freetype/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 26155
          http://sourceforge.net/p/gar/code/26155
Author:   dmichelsen
Date:     2017-04-25 10:06:08 +0000 (Tue, 25 Apr 2017)
Log Message:
-----------
freetype/trunk: Adjust building only 32 bit for Solaris 9 i386

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

Modified: csw/mgar/pkg/freetype/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freetype/trunk/Makefile	2017-04-25 09:54:16 UTC (rev 26154)
+++ csw/mgar/pkg/freetype/trunk/Makefile	2017-04-25 10:06:08 UTC (rev 26155)
@@ -21,18 +21,17 @@
 
 VENDOR_URL = http://www.freetype.org/
 
+PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
 PACKAGES += CSWlibfreetype6
 SPKG_DESC_CSWlibfreetype6 = A free and portable TrueType font rendering engine, libfreetype.so.6
 PKGFILES_CSWlibfreetype6 += $(call pkgfiles_lib,libfreetype.so.6)
-
 RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibbz2-1-0
 RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibz1
 RUNTIME_DEP_PKGS_CSWlibfreetype6 += CSWlibpng16-16
-
 RUNTIME_DEP_PKGS_CSWlibfreetype6_5.10 += CSWlibharfbuzz0
-
 RUNTIME_DEP_PKGS_CSWlibfreetype6 += $(RUNTIME_DEP_PKGS_CSWlibfreetype6_$(GAROSREL))
-
 OBSOLETED_BY_CSWlibfreetype6 += CSWftype2
 CATALOGNAME_CSWftype2 = freetype2_stub
 
@@ -41,7 +40,6 @@
 
 # Only for 10 
 CHECKPKG_OVERRIDES_CSWlibfreetype6_5.10 += soname-not-found|libharfbuzz.so.0|is|needed|by|opt/csw/lib/amd64/libfreetype.so.6.12.2
-
 CHECKPGK_OVERRIDES_CSWlibfreetype6 += $(CHECKPKG_OVERRIDES_CSWlibfreetype6_$(GAROSREL))
 
 PACKAGES += CSWlibfreetype-dev
@@ -49,20 +47,14 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibfreetype-dev += CSWlibfreetype6
 
-#where can we build?
-PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# Do not build a unified 32/64 bit package for Solaris 9 i386
+BUILD64_LIBS_ONLY-sparc-5.9 = 1
+BUILD64_LIBS_ONLY-sparc-5.10 = 1
+BUILD64_LIBS_ONLY-i386-5.10 = 1
+BUILD64_LIBS_ONLY = $(BUILD64_LIBS_ONLY-$(GARCH)-$(GAROSREL))
 
-
 GARCOMPILER = SUN
 GNUMAKE = gmake
 EXTRA_CONFIGURE_EXPORTS = GNUMAKE
 
-BUILD64_LIBS_ONLY = 1
-
-BUILD64-5.10 = 1
-BUILD64 = $(BUILD64-$(GAROSREL))
-
-
-
 include gar/category.mk

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