[csw-devel] SF.net SVN: gar:[7855] csw/mgar/pkg/ilmbase/trunk
hson at users.sourceforge.net
hson at users.sourceforge.net
Mon Jan 4 04:57:35 CET 2010
Revision: 7855
http://gar.svn.sourceforge.net/gar/?rev=7855&view=rev
Author: hson
Date: 2010-01-04 03:57:34 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
Split package in two
64-bit fixes
Modified Paths:
--------------
csw/mgar/pkg/ilmbase/trunk/Makefile
csw/mgar/pkg/ilmbase/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch
Modified: csw/mgar/pkg/ilmbase/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-03 23:03:17 UTC (rev 7854)
+++ csw/mgar/pkg/ilmbase/trunk/Makefile 2010-01-04 03:57:34 UTC (rev 7855)
@@ -29,41 +29,65 @@
DISTFILES += libImath.so.2.0.2.i
DISTFILES += libImath.so.2.0.2.s
+PACKAGES = CSWilmbase CSWilmbasedevel
+CATALOGNAME_CSWilmbase = ilmbase
+CATALOGNAME_CSWilmbasedevel = ilmbase_devel
+
+SPKG_DESC_CSWilmbase += Base libraries used by OpenEXR
+SPKG_DESC_CSWilmbasedevel += Base libraries used by OpenEXR - developer package
+
+PKGFILES_CSWilmbasedevel = $(PKGFILES_DEVEL)
+
+REQUIRED_PKGS_CSWilmbase +=
+REQUIRED_PKGS_CSWilmbasedevel += CSWilmbase
+
SPKG_SOURCEURL = http://www.openexr.com
LICENSE = LICENSE
-# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+UPSTREAM_MASTER_SITES = http://download.savannah.nongnu.org/releases/openexr/
-# If the url used to check for software update is different of MASTER_SITES, then
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES =
-
CONFIGURE_ARGS = $(DIRPATHS)
PATCHFILES = ImathMath.patch
+PATCHFILES += ltmain.sh.patch
LIBS += -lCstd -lCrun -lc -lm
export LIBS
-TEST_TARGET = check
+BUILD64 = 1
+# Check fails if library isn't installed /opt/csw/lib and until a 64-bit
+#TEST_TARGET = check
+TEST_TARGET =
+
+STRIP_LIBTOOL = 1
+
include gar/category.mk
+#pre-configure-modulated:
+# @echo " ==> Regenerating build tools..."
+# @(cd $(WORKSRC) ; \
+# aclocal && \
+# autoconf && \
+# libtoolize --automake --force && \
+# aclocal && \
+# automake -a )
+# @$(MAKECOOKIE)
post-install-isa-sparcv8:
@cp $(FILEDIR)/libHalf.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2
@cp $(FILEDIR)/libIex.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2
@cp $(FILEDIR)/libImath.so.2.0.2.s $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2
- @ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2
- @ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2
- @ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2
+ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi )
+ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi )
+ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi )
post-install-isa-i386:
@cp $(FILEDIR)/libHalf.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2.0.2
@cp $(FILEDIR)/libIex.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libIex.so.2.0.2
@cp $(FILEDIR)/libImath.so.2.0.2.i $(INSTALLISADIR)/opt/csw/lib/libImath.so.2.0.2
- @ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2
- @ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2
- @ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2
+ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libHalf.so.2 ] ; then ln -s libHalf.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libHalf.so.2 ; fi )
+ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libIex.so.2 ] ; then ln -s libIex.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libIex.so.2 ; fi )
+ @( if [ ! -r $(INSTALLISADIR)$(libdir)/libImath.so.2 ] ; then ln -s libImath.so.2.0.2 $(INSTALLISADIR)/opt/csw/lib/libImath.so.2 ; fi )
Modified: csw/mgar/pkg/ilmbase/trunk/checksums
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/checksums 2010-01-03 23:03:17 UTC (rev 7854)
+++ csw/mgar/pkg/ilmbase/trunk/checksums 2010-01-04 03:57:34 UTC (rev 7855)
@@ -1,8 +1,9 @@
-f76f094e69a6079b0beb93d97e2a217e download/ilmbase-1.0.1.tar.gz
-b7daafc6a6c92a3cf9dfb47e24fa630f download/libHalf.so.2.0.2.i
-cdce2f2b1c7d00dc76124ecb5418b9a2 download/libHalf.so.2.0.2.s
-1b589f5b747846688c27f55de9b1ec7a download/libIex.so.2.0.2.i
-ddf913c9000dc4580ad330b9dd938826 download/libIex.so.2.0.2.s
-756523f803ce1be3e125b6ce63e3183c download/libImath.so.2.0.2.i
-ce47a211381deadfc38722f5abda54d7 download/libImath.so.2.0.2.s
-6873969f50e5d1c43ec93a90a65d85bd download/ImathMath.patch
+6873969f50e5d1c43ec93a90a65d85bd ImathMath.patch
+f76f094e69a6079b0beb93d97e2a217e ilmbase-1.0.1.tar.gz
+b7daafc6a6c92a3cf9dfb47e24fa630f libHalf.so.2.0.2.i
+cdce2f2b1c7d00dc76124ecb5418b9a2 libHalf.so.2.0.2.s
+1b589f5b747846688c27f55de9b1ec7a libIex.so.2.0.2.i
+ddf913c9000dc4580ad330b9dd938826 libIex.so.2.0.2.s
+756523f803ce1be3e125b6ce63e3183c libImath.so.2.0.2.i
+ce47a211381deadfc38722f5abda54d7 libImath.so.2.0.2.s
+f1016498bff3cce0c722108f4603e6c5 ltmain.sh.patch
Added: csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch
===================================================================
--- csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch (rev 0)
+++ csw/mgar/pkg/ilmbase/trunk/files/ltmain.sh.patch 2010-01-04 03:57:34 UTC (rev 7855)
@@ -0,0 +1,24 @@
+--- ilmbase-1.0.1.orig/ltmain.sh 2006-12-16 00:23:48.000000000 +0100
++++ ilmbase-1.0.1/ltmain.sh 2010-01-04 03:01:58.123927193 +0100
+@@ -1553,9 +1553,10 @@
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+- if test "$with_gcc" = "yes" ; then
++# Fix for 64-bit CC
++# if test "$with_gcc" = "yes" ; then
+ compiler_flags="$compiler_flags $arg"
+- fi
++# fi
+ continue
+ ;;
+
+@@ -4015,7 +4016,7 @@
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+- eval cmd=\"$cmd\"
++ eval cmd=\"$cmd -norunpath\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
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