[csw-devel] SF.net SVN: gar:[10206] csw/mgar/pkg/libbabl/trunk
theferret at users.sourceforge.net
theferret at users.sourceforge.net
Sat Jun 12 20:13:00 CEST 2010
Revision: 10206
http://gar.svn.sourceforge.net/gar/?rev=10206&view=rev
Author: theferret
Date: 2010-06-12 18:13:00 +0000 (Sat, 12 Jun 2010)
Log Message:
-----------
libbabl: works now
Modified Paths:
--------------
csw/mgar/pkg/libbabl/trunk/Makefile
csw/mgar/pkg/libbabl/trunk/copyright
csw/mgar/pkg/libbabl/trunk/patchfile.preconf
Added Paths:
-----------
csw/mgar/pkg/libbabl/trunk/prototype.i386
csw/mgar/pkg/libbabl/trunk/prototype.sparc
Removed Paths:
-------------
csw/mgar/pkg/libbabl/trunk/prototype
Modified: csw/mgar/pkg/libbabl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libbabl/trunk/Makefile 2010-06-12 10:49:12 UTC (rev 10205)
+++ csw/mgar/pkg/libbabl/trunk/Makefile 2010-06-12 18:13:00 UTC (rev 10206)
@@ -54,8 +54,8 @@
CREATEPKG=createpkg -r `pwd`/build/*/cswstage
-#all: $(ARCH)-32 build/.stage1 $(ARCH)-64 package
-all: $(ARCH)-32 package
+all: $(ARCH)-32 build/.stage1 $(ARCH)-64 package
+#all: $(ARCH)-32 package
# ARCH-XX handles configure, build, and stage for its own combo
#
@@ -64,7 +64,9 @@
-extract:
+extract: build/.extract.done
+
+build/.extract.done:
test -d build || mkdir build
@if test -f $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
echo Extracting $(ARCHIVENAME) under build dir... ;\
@@ -72,6 +74,7 @@
else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
exit 1; \
fi
+ touch build/.extract.done
clean distclean:
@@ -128,10 +131,11 @@
build/.$(ARCH)-64.done: $(ARCH)-64
+build: extract
# Since we share the same src tree, we should only need to
# pre-configure patching one time for all.
-build/.patch-preconf.done:
+build/.patch-preconf.done: build
if test -f patchfile.preconf ; then \
gpatch -d $(SRCDIR) -p0 <patchfile.preconf ; fi
touch $@
@@ -193,10 +197,10 @@
# SO, odds are you'll have to write a customized target
build/.stage-$(ARCH)-64.done: $(SRCDIR)/cswstage
@echo ""
- @echo debug: Using generic stage-64 routines
- @echo relying on customized prototype file
- @(cd $(SRCDIR)/*/.libs; tar cf - lib*.so.*.*.* ) | (cd $(SRCDIR)/cswstage ; tar xf -)
- @(cd $(SRCDIR); cp *.pc cswstage)
+ rm -rf cd $(SRCDIR)/tmpdest
+ cd $(SRCDIR) && $(MAKE) DESTDIR=`/bin/pwd`/tmpdest install
+ (cd $(SRCDIR)/tmpdest; tar cf - ./$(LIBDIR64_$(ARCH)) )| \
+ (cd $(SRCDIR)/cswstage; tar xvf -)
@echo ""
touch $@
Modified: csw/mgar/pkg/libbabl/trunk/copyright
===================================================================
--- csw/mgar/pkg/libbabl/trunk/copyright 2010-06-12 10:49:12 UTC (rev 10205)
+++ csw/mgar/pkg/libbabl/trunk/copyright 2010-06-12 18:13:00 UTC (rev 10206)
@@ -1,2 +1,2 @@
This library is copyrighted by the GNU LGPL v3.
-See /opt/csw/share/doc/babl/COPYING for the full text.
+See /opt/csw/share/doc/libbabl/COPYING for the full text.
Modified: csw/mgar/pkg/libbabl/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/libbabl/trunk/patchfile.preconf 2010-06-12 10:49:12 UTC (rev 10205)
+++ csw/mgar/pkg/libbabl/trunk/patchfile.preconf 2010-06-12 18:13:00 UTC (rev 10206)
@@ -1,5 +1,5 @@
---- build/babl-0.1.2/babl/base/type-u16.c.orig Sat Jun 12 03:51:43 2010
-+++ build/babl-0.1.2/babl/base/type-u16.c Sat Jun 12 03:52:11 2010
+--- babl/base/type-u16.c.orig Sat Jun 12 03:51:43 2010
++++ babl/base/type-u16.c Sat Jun 12 03:52:11 2010
@@ -18,7 +18,12 @@
#include "config.h"
@@ -13,8 +13,8 @@
#include <assert.h>
#include <math.h>
---- build/babl-0.1.2/babl/base/type-u32.c.orig Sat Jun 12 03:51:43 2010
-+++ build/babl-0.1.2/babl/base/type-u32.c Sat Jun 12 03:52:11 2010
+--- babl/base/type-u32.c.orig Sat Jun 12 03:51:43 2010
++++ babl/base/type-u32.c Sat Jun 12 03:52:11 2010
@@ -18,7 +18,12 @@
#include "config.h"
@@ -28,8 +28,8 @@
#include <assert.h>
#include <math.h>
---- build/babl-0.1.2/babl/base/type-u8foo.c.orig Sat Jun 12 03:47:35 2010
-+++ build/babl-0.1.2/babl/base/type-u8foo.c Sat Jun 12 03:48:29 2010
+--- babl/base/type-u8.c.orig Sat Jun 12 03:47:35 2010
++++ babl/base/type-u8.c Sat Jun 12 03:48:29 2010
@@ -19,7 +19,12 @@
#include "config.h"
#include <string.h>
@@ -43,8 +43,8 @@
#include "babl-internal.h"
#include "babl-base.h"
---- build/babl-0.1.2/tests/Makefile.in.orig Sat Jun 12 04:01:58 2010
-+++ build/babl-0.1.2/tests/Makefile.in Sat Jun 12 04:02:38 2010
+--- tests/Makefile.in.orig Sat Jun 12 04:01:58 2010
++++ tests/Makefile.in Sat Jun 12 04:02:38 2010
@@ -338,7 +338,7 @@
top_srcdir = @top_srcdir@
TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions/.libs
@@ -54,8 +54,8 @@
LDADD = $(top_builddir)/babl/libbabl- at BABL_API_VERSION@.la \
$(MATH_LIB)
---- build/babl-0.1.2/docs/Makefile.in.orig Sat Jun 12 04:15:10 2010
-+++ build/babl-0.1.2/docs/Makefile.in Sat Jun 12 04:15:33 2010
+--- docs/Makefile.in.orig Sat Jun 12 04:15:10 2010
++++ docs/Makefile.in Sat Jun 12 04:15:33 2010
@@ -639,14 +639,14 @@
cp $< $@
(which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\
@@ -76,8 +76,8 @@
echo " [OK]"
distclean-local:
---- build/babl-0.1.2/babl/babl-memory.c.orig Tue Nov 24 04:07:18 2009
-+++ build/babl-0.1.2/babl/babl-memory.c Sat Jun 12 03:55:55 2010
+--- babl/babl-memory.c.orig Tue Nov 24 04:07:18 2009
++++ babl/babl-memory.c Sat Jun 12 03:55:55 2010
@@ -17,7 +17,12 @@
*/
@@ -91,8 +91,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
---- build/babl-0.1.2/babl/babl-mutex.c.orig Sat Jun 12 03:56:53 2010
-+++ build/babl-0.1.2/babl/babl-mutex.c Sat Jun 12 03:57:21 2010
+--- babl/babl-mutex.c.orig Sat Jun 12 03:56:53 2010
++++ babl/babl-mutex.c Sat Jun 12 03:57:21 2010
@@ -17,7 +17,12 @@
*/
Deleted: csw/mgar/pkg/libbabl/trunk/prototype
===================================================================
--- csw/mgar/pkg/libbabl/trunk/prototype 2010-06-12 10:49:12 UTC (rev 10205)
+++ csw/mgar/pkg/libbabl/trunk/prototype 2010-06-12 18:13:00 UTC (rev 10206)
@@ -1,33 +0,0 @@
-i pkginfo
-i copyright
-d none /opt/csw/lib 0755 root bin
-s none /opt/csw/lib/libbabl-0.1.so.0=libbabl-0.1.so.0.101.1
-f none /opt/csw/lib/libbabl-0.1.so.0.101.1 0755 root bin
-f none /opt/csw/lib/libbabl-0.1.la 0755 root bin
-d none /opt/csw/lib/babl-0.1 0755 root bin
-f none /opt/csw/lib/babl-0.1/naive-CMYK.so 0755 root bin
-f none /opt/csw/lib/babl-0.1/sse-fixups.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/CIE.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/CIE.so 0755 root bin
-f none /opt/csw/lib/babl-0.1/naive-CMYK.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/sse-fixups.so 0755 root bin
-f none /opt/csw/lib/babl-0.1/gimp-8bit.so 0755 root bin
-f none /opt/csw/lib/babl-0.1/gegl-fixups.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/gggl-lies.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/gggl.so 0755 root bin
-f none /opt/csw/lib/babl-0.1/gggl.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/gggl-lies.so 0755 root bin
-f none /opt/csw/lib/babl-0.1/gimp-8bit.la 0755 root bin
-f none /opt/csw/lib/babl-0.1/gegl-fixups.so 0755 root bin
-s none /opt/csw/lib/libbabl-0.1.so=libbabl-0.1.so.0.101.1
-d none /opt/csw/lib/pkgconfig 0755 root bin
-f none /opt/csw/lib/pkgconfig/babl.pc 0644 root bin
-d none /opt/csw/include 0755 root bin
-d none /opt/csw/include/babl-0.1 0755 root bin
-d none /opt/csw/include/babl-0.1/babl 0755 root bin
-f none /opt/csw/include/babl-0.1/babl/babl.h 0644 root bin
-f none /opt/csw/include/babl-0.1/babl/babl-macros.h 0644 root bin
-f none /opt/csw/include/babl-0.1/babl/babl-version.h 0644 root bin
-f none /opt/csw/include/babl-0.1/babl/babl-types.h 0644 root bin
-d none /opt/csw/share/doc/babl 0755 root bin
-f none /opt/csw/share/doc/babl/COPYING=COPYING 0644 root bin
Added: csw/mgar/pkg/libbabl/trunk/prototype.i386
===================================================================
--- csw/mgar/pkg/libbabl/trunk/prototype.i386 (rev 0)
+++ csw/mgar/pkg/libbabl/trunk/prototype.i386 2010-06-12 18:13:00 UTC (rev 10206)
@@ -0,0 +1,55 @@
+i pkginfo
+i copyright
+d none /opt/csw/lib 0755 root bin
+s none /opt/csw/lib/libbabl-0.1.so.0=libbabl-0.1.so.0.101.1
+f none /opt/csw/lib/libbabl-0.1.so.0.101.1 0755 root bin
+f none /opt/csw/lib/libbabl-0.1.la 0755 root bin
+d none /opt/csw/lib/babl-0.1 0755 root bin
+f none /opt/csw/lib/babl-0.1/naive-CMYK.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/sse-fixups.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/CIE.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/CIE.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/naive-CMYK.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/sse-fixups.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gimp-8bit.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gegl-fixups.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl-lies.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl-lies.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gimp-8bit.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gegl-fixups.so 0755 root bin
+s none /opt/csw/lib/libbabl-0.1.so=libbabl-0.1.so.0.101.1
+d none /opt/csw/lib/pkgconfig 0755 root bin
+f none /opt/csw/lib/pkgconfig/babl.pc 0644 root bin
+d none /opt/csw/include 0755 root bin
+d none /opt/csw/include/babl-0.1 0755 root bin
+d none /opt/csw/include/babl-0.1/babl 0755 root bin
+f none /opt/csw/include/babl-0.1/babl/babl.h 0644 root bin
+f none /opt/csw/include/babl-0.1/babl/babl-macros.h 0644 root bin
+f none /opt/csw/include/babl-0.1/babl/babl-version.h 0644 root bin
+f none /opt/csw/include/babl-0.1/babl/babl-types.h 0644 root bin
+d none /opt/csw/share/doc/libbabl 0755 root bin
+f none /opt/csw/share/doc/libbabl/COPYING=COPYING 0644 root bin
+d none /opt/csw/lib/amd64 0755 root bin
+s none /opt/csw/lib/amd64/libbabl-0.1.so.0=libbabl-0.1.so.0.101.1
+f none /opt/csw/lib/amd64/libbabl-0.1.so.0.101.1 0755 root bin
+f none /opt/csw/lib/amd64/libbabl-0.1.la 0755 root bin
+d none /opt/csw/lib/amd64/babl-0.1 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/naive-CMYK.so 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/sse-fixups.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/CIE.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/CIE.so 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/naive-CMYK.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/sse-fixups.so 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gimp-8bit.so 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gegl-fixups.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gggl-lies.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gggl.so 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gggl.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gggl-lies.so 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gimp-8bit.la 0755 root bin
+f none /opt/csw/lib/amd64/babl-0.1/gegl-fixups.so 0755 root bin
+s none /opt/csw/lib/amd64/libbabl-0.1.so=libbabl-0.1.so.0.101.1
+d none /opt/csw/lib/amd64/pkgconfig 0755 root bin
+f none /opt/csw/lib/amd64/pkgconfig/babl.pc 0644 root bin
Added: csw/mgar/pkg/libbabl/trunk/prototype.sparc
===================================================================
--- csw/mgar/pkg/libbabl/trunk/prototype.sparc (rev 0)
+++ csw/mgar/pkg/libbabl/trunk/prototype.sparc 2010-06-12 18:13:00 UTC (rev 10206)
@@ -0,0 +1,55 @@
+i pkginfo
+i copyright
+d none /opt/csw/lib 0755 root bin
+s none /opt/csw/lib/libbabl-0.1.so.0=libbabl-0.1.so.0.101.1
+f none /opt/csw/lib/libbabl-0.1.so.0.101.1 0755 root bin
+f none /opt/csw/lib/libbabl-0.1.la 0755 root bin
+d none /opt/csw/lib/babl-0.1 0755 root bin
+f none /opt/csw/lib/babl-0.1/naive-CMYK.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/sse-fixups.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/CIE.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/CIE.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/naive-CMYK.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/sse-fixups.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gimp-8bit.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gegl-fixups.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl-lies.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gggl-lies.so 0755 root bin
+f none /opt/csw/lib/babl-0.1/gimp-8bit.la 0755 root bin
+f none /opt/csw/lib/babl-0.1/gegl-fixups.so 0755 root bin
+s none /opt/csw/lib/libbabl-0.1.so=libbabl-0.1.so.0.101.1
+d none /opt/csw/lib/pkgconfig 0755 root bin
+f none /opt/csw/lib/pkgconfig/babl.pc 0644 root bin
+d none /opt/csw/include 0755 root bin
+d none /opt/csw/include/babl-0.1 0755 root bin
+d none /opt/csw/include/babl-0.1/babl 0755 root bin
+f none /opt/csw/include/babl-0.1/babl/babl.h 0644 root bin
+f none /opt/csw/include/babl-0.1/babl/babl-macros.h 0644 root bin
+f none /opt/csw/include/babl-0.1/babl/babl-version.h 0644 root bin
+f none /opt/csw/include/babl-0.1/babl/babl-types.h 0644 root bin
+d none /opt/csw/share/doc/libbabl 0755 root bin
+f none /opt/csw/share/doc/libbabl/COPYING=COPYING 0644 root bin
+d none /opt/csw/lib/sparcv9 0755 root bin
+s none /opt/csw/lib/sparcv9/libbabl-0.1.so.0=libbabl-0.1.so.0.101.1
+f none /opt/csw/lib/sparcv9/libbabl-0.1.so.0.101.1 0755 root bin
+f none /opt/csw/lib/sparcv9/libbabl-0.1.la 0755 root bin
+d none /opt/csw/lib/sparcv9/babl-0.1 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/naive-CMYK.so 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/sse-fixups.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/CIE.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/CIE.so 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/naive-CMYK.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/sse-fixups.so 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gimp-8bit.so 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gegl-fixups.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gggl-lies.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gggl.so 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gggl.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gggl-lies.so 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gimp-8bit.la 0755 root bin
+f none /opt/csw/lib/sparcv9/babl-0.1/gegl-fixups.so 0755 root bin
+s none /opt/csw/lib/sparcv9/libbabl-0.1.so=libbabl-0.1.so.0.101.1
+d none /opt/csw/lib/sparcv9/pkgconfig 0755 root bin
+f none /opt/csw/lib/sparcv9/pkgconfig/babl.pc 0644 root bin
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