[csw-devel] SF.net SVN: gar:[21697] csw/mgar/pkg/ilmbase/trunk

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sat Aug 10 17:48:54 CEST 2013


Revision: 21697
          http://gar.svn.sourceforge.net/gar/?rev=21697&view=rev
Author:   lblume
Date:     2013-08-10 15:48:53 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
ilmbase/trunk: Bump version to 2.0.1; switch compiler to GCC4

Modified Paths:
--------------
    csw/mgar/pkg/ilmbase/trunk/Makefile
    csw/mgar/pkg/ilmbase/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/ilmbase/trunk/files/0002_avoid_cpu_opt_on_sparc.patch

Modified: csw/mgar/pkg/ilmbase/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/Makefile	2013-08-10 15:44:45 UTC (rev 21696)
+++ csw/mgar/pkg/ilmbase/trunk/Makefile	2013-08-10 15:48:53 UTC (rev 21697)
@@ -1,5 +1,5 @@
 NAME = ilmbase
-VERSION = 1.0.2
+VERSION = 2.0.1
 GARTYPE = v2
 
 DESCRIPTION = Base libraries used by OpenEXR
@@ -24,50 +24,80 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 PATCHFILES += ImathMath.patch
+PATCHFILES += 0002_avoid_cpu_opt_on_sparc.patch
 
 VENDOR_URL = http://www.openexr.com
 
 LICENSE = LICENSE
 
-PACKAGES += CSWlibhalf6
-SPKG_DESC_CSWlibhalf6 += $(DESCRIPTION), libHalf.so.6
-PKGFILES_CSWlibhalf6 += $(call pkgfiles_lib,libHalf.so.6)
-OBSOLETED_BY_CSWlibhalf6 += CSWilmbase
-RUNTIME_DEP_PKGS_CSWlibilmthread6 += CSWlibiex6
+GARCOMPILER = GCC4
 
-PACKAGES += CSWlibiex6
-SPKG_DESC_CSWlibiex6 += $(DESCRIPTION), libIex.so.6
-PKGFILES_CSWlibiex6 += $(call pkgfiles_lib,libIex.so.6)
-OBSOLETED_BY_CSWlibiex6 += CSWilmbase
+PACKAGES += CSWlibhalf10
+CATALOGNAME_CSWlibhalf10 = libhalf10
+PKGFILES_CSWlibhalf10 += $(call baseisadirs,$(libdir),libHalf\.so\.10\.0\.1)
+PKGFILES_CSWlibhalf10 += $(call baseisadirs,$(libdir),libHalf\.so\.10(\.\d+)*)
+SPKG_DESC_CSWlibhalf10 += $(DESCRIPTION), libHalf.so.10
+RUNTIME_DEP_PKGS_CSWlibhalf10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibhalf10 += CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibhalf10 += no-direct-binding
 
-PACKAGES += CSWlibilmthread6
-SPKG_DESC_CSWlibilmthread6 += $(DESCRIPTION), libIlmThread.so.6
-PKGFILES_CSWlibilmthread6 += $(call pkgfiles_lib,libIlmThread.so.6)
-OBSOLETED_BY_CSWlibilmthread6 += CSWilmbase
+PACKAGES += CSWlibiex2-0-10
+CATALOGNAME_CSWlibiex2-0-10 = libiex2_0_10
+PKGFILES_CSWlibiex2-0-10 += $(call baseisadirs,$(libdir),libIex-2_0\.so\.10\.0\.1)
+PKGFILES_CSWlibiex2-0-10 += $(call baseisadirs,$(libdir),libIex-2_0\.so\.10(\.\d+)*)
+SPKG_DESC_CSWlibiex2-0-10 += $(DESCRIPTION), libIex-2_0.so.10
+RUNTIME_DEP_PKGS_CSWlibiex2-0-10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibiex2-0-10 += CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibiex2-0-10 += no-direct-binding
 
-PACKAGES += CSWlibimath6
-SPKG_DESC_CSWlibimath6 += $(DESCRIPTION), libImath.so.6
-PKGFILES_CSWlibimath6 += $(call pkgfiles_lib,libImath.so.6)
-RUNTIME_DEP_PKGS_CSWlibimath6 += CSWlibiex6
-OBSOLETED_BY_CSWlibimath6 += CSWilmbase
+PACKAGES += CSWlibiexmath2-0-10
+CATALOGNAME_CSWlibiexmath2-0-10 = libiexmath2_0_10
+PKGFILES_CSWlibiexmath2-0-10 += $(call baseisadirs,$(libdir),libIexMath-2_0\.so\.10\.0\.1)
+PKGFILES_CSWlibiexmath2-0-10 += $(call baseisadirs,$(libdir),libIexMath-2_0\.so\.10(\.\d+)*)
+SPKG_DESC_CSWlibiexmath2-0-10 += $(DESCRIPTION), libIexMath-2_0.so.10
+RUNTIME_DEP_PKGS_CSWlibiexmath2-0-10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibiexmath2-0-10 += CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibiexmath2-0-10 += no-direct-binding
 
+PACKAGES += CSWlibilmthread2-0-10
+CATALOGNAME_CSWlibilmthread2-0-10 = libilmthread2_0_10
+PKGFILES_CSWlibilmthread2-0-10 += $(call baseisadirs,$(libdir),libIlmThread-2_0\.so\.10\.0\.1)
+PKGFILES_CSWlibilmthread2-0-10 += $(call baseisadirs,$(libdir),libIlmThread-2_0\.so\.10(\.\d+)*)
+SPKG_DESC_CSWlibilmthread2-0-10 += $(DESCRIPTION), libIlmThread-2_0.so.10
+RUNTIME_DEP_PKGS_CSWlibilmthread2-0-10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibilmthread2-0-10 += CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibilmthread2-0-10 += no-direct-binding
+
+PACKAGES += CSWlibimath2-0-10
+CATALOGNAME_CSWlibimath2-0-10 = libimath2_0_10
+PKGFILES_CSWlibimath2-0-10 += $(call baseisadirs,$(libdir),libImath-2_0\.so\.10\.0\.1)
+PKGFILES_CSWlibimath2-0-10 += $(call baseisadirs,$(libdir),libImath-2_0\.so\.10(\.\d+)*)
+SPKG_DESC_CSWlibimath2-0-10 += $(DESCRIPTION), libImath-2_0.so.10
+RUNTIME_DEP_PKGS_CSWlibimath2-0-10 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibimath2-0-10 += CSWlibstdc++6
+#CHECKPKG_OVERRIDES_CSWlibimath2-0-10 += no-direct-binding
+
 PACKAGES += CSWilmbase-dev
 SPKG_DESC_CSWilmbase-dev += Development files for ILM base libraries
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibilmthread6
-RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibhalf6
-RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibiex6
-RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibimath6
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibhalf10
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibiex2-0-10
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibiexmath2-0-10
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibilmthread2-0-10
+RUNTIME_DEP_PKGS_CSWilmbase-dev += CSWlibimath2-0-10
 OBSOLETED_BY_CSWilmbase-dev += CSWilmbasedevel
 CATALOGNAME_CSWilmbasedevel = ilmbase_devel_stub
 
-EXTRA_LD_FLAGS = -lm
+EXTRA_LD_FLAGS   = -lm
+EXTRA_LD_OPTIONS = -z nolazyload
 
-EXTRA_CXXFLAGS += -norunpath
-REINPLACE_MATCH = (\|-xarch=)
-REINPLACE_WITH = |-norunpath$$1
-REINPLACE_FILES += ltmain.sh
-
 BUILD64_LIBS_ONLY = 1
 
+# make check has some linking issues
+SKIPTEST = 1
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-shared
+CONFIGURE_ARGS += --disable-static
+
 include gar/category.mk

Modified: csw/mgar/pkg/ilmbase/trunk/checksums
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/checksums	2013-08-10 15:44:45 UTC (rev 21696)
+++ csw/mgar/pkg/ilmbase/trunk/checksums	2013-08-10 15:48:53 UTC (rev 21697)
@@ -1 +1 @@
-26c133ee8ca48e1196fbfb3ffe292ab4  ilmbase-1.0.2.tar.gz
+74c0d0d2873960bd0dc1993f8e03f0ae  ilmbase-2.0.1.tar.gz

Added: csw/mgar/pkg/ilmbase/trunk/files/0002_avoid_cpu_opt_on_sparc.patch
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/files/0002_avoid_cpu_opt_on_sparc.patch	                        (rev 0)
+++ csw/mgar/pkg/ilmbase/trunk/files/0002_avoid_cpu_opt_on_sparc.patch	2013-08-10 15:48:53 UTC (rev 21697)
@@ -0,0 +1,11 @@
+--- a/IexMath/IexMathFpu.cpp	Sat Aug 10 10:59:31 2013
++++ b/IexMath/IexMathFpu.cpp	Sat Aug 10 11:03:14 2013
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ 
+-#ifdef HAVE_UCONTEXT_H
++#if defined(HAVE_UCONTEXT_H) && !defined (sun)
+ 
+ 
+ #include <ucontext.h>

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



More information about the devel mailing list