OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Feb-2005 10:28:30
Branch: HEAD Handle: 2005021009283000
Modified files:
openpkg-src/libuuid libuuid.patch libuuid.spec
Log:
upgrading package: libuuid 1.35 -> 1.36
Summary:
Revision Changes Path
1.2 +60 -61 openpkg-src/libuuid/libuuid.patch
1.8 +3 -3 openpkg-src/libuuid/libuuid.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libuuid/libuuid.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 libuuid.patch
--- openpkg-src/libuuid/libuuid.patch 6 Jan 2004 13:51:15 -0000 1.1
+++ openpkg-src/libuuid/libuuid.patch 10 Feb 2005 09:28:30 -0000 1.2
@@ -1,51 +1,16 @@
-Index: lib/uuid/configure.in
---- lib/uuid/configure.in.orig Sun Dec 7 18:11:38 2003
-+++ lib/uuid/configure.in Tue Jan 6 13:37:23 2004
-@@ -7,4 +7,31 @@
-
- AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
- AC_CHECK_FUNCS(srandom)
--AC_OUTPUT(Makefile)
-+
-+dnl
-+dnl Word sizes...
-+dnl
-+if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
-+ # if cross-compiling, with no cached values, just assume something
common.
-+ ac_cv_sizeof_short=2
-+ ac_cv_sizeof_int=4
-+ ac_cv_sizeof_long=4
-+ ac_cv_sizeof_long_long=8
-+ AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming
short=2, int=4, long=4, long long=8])
-+fi
-+AC_CHECK_SIZEOF(short)
-+AC_CHECK_SIZEOF(int)
-+AC_CHECK_SIZEOF(long)
-+AC_CHECK_SIZEOF(long long)
-+SIZEOF_SHORT=$ac_cv_sizeof_short
-+SIZEOF_INT=$ac_cv_sizeof_int
-+SIZEOF_LONG=$ac_cv_sizeof_long
-+SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
-+AC_SUBST(SIZEOF_SHORT)
-+AC_SUBST(SIZEOF_INT)
-+AC_SUBST(SIZEOF_LONG)
-+AC_SUBST(SIZEOF_LONG_LONG)
-+AC_C_BIGENDIAN
-+
-+AC_OUTPUT(Makefile uuid_types.h)
-+
Index: lib/uuid/Makefile.in
---- lib/uuid/Makefile.in.orig Sun Dec 7 18:11:38 2003
-+++ lib/uuid/Makefile.in Tue Jan 6 13:47:07 2004
-@@ -5,14 +5,17 @@
- # This file can be redistributed under the terms of the GNU General
- # Public License
+--- lib/uuid/Makefile.in.orig 2005-02-05 21:48:48 +0100
++++ lib/uuid/Makefile.in 2005-02-10 09:56:44 +0100
+@@ -1,14 +1,18 @@
+ # Makefile for the UUID library
+ #
+ALL_CFLAGS = @CFLAGS@ -I. -I..
+ALL_LDFLAGS = @LDFLAGS@
+LIBUUID = libuuid.a
+STATIC_LIBUUID = libuuid.a
+SUBSTITUTE = cp
++SUBSTITUTE_UPTIME = cp
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -58,48 +23,82 @@
all::
-@@ -66,26 +69,14 @@
+@@ -53,24 +57,15 @@
BSDLIB_MYDIR = uuid
BSDLIB_INSTALL_DIR = $(root_libdir)
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
.c.o:
- $(CC) $(ALL_CFLAGS) -c $< -o $@
[EMAIL PROTECTED]@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
[EMAIL PROTECTED]@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
[EMAIL PROTECTED]@ (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX)
$(ALL_CFLAGS) \
[EMAIL PROTECTED]@ -o jump/$*.o -c $<)
[EMAIL PROTECTED]@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
[EMAIL PROTECTED]@ $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+ @echo " CC $<"
+ @$(CC) $(ALL_CFLAGS) -c $< -o $@
[EMAIL PROTECTED]@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
[EMAIL PROTECTED]@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
[EMAIL PROTECTED]@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
[EMAIL PROTECTED]@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c
$<
+-
+-all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
--all:: tst_uuid uuid_time $(SMANPAGES)
+-$(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in
$(top_builddir)/config.status
+- cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
+libuuid.a: $(OBJS)
+ ar cr libuuid.a $(OBJS)
+ ranlib libuuid.a
-
--$(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in
$(top_builddir)/config.status
-- cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
++
+all:: tst_uuid uuid_time $(SMANPAGES)
tst_uuid.o: $(srcdir)/tst_uuid.c
- $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
-@@ -161,13 +152,6 @@
- mostlyclean:: clean
- distclean:: clean
- $(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
--
+ @echo " CC $@"
+@@ -172,13 +167,6 @@
+ $(RM) -f .depend Makefile uuid.pc \
+ $(srcdir)/TAGS $(srcdir)/Makefile.in.old
+
-#
-# Hack to parallel makes recognize dependencies correctly.
-#
-../../lib/libuuid.a: libuuid.a
-../../lib/libuuid.so: image
-../../lib/libuuid.dylib: image
-
+-
# +++ Dependency line eater +++
#
+ # Makefile dependencies follow. This must be the last section in
+--- lib/uuid/configure.in.orig 2003-12-07 18:11:38 +0100
++++ lib/uuid/configure.in 2005-02-10 09:55:37 +0100
+@@ -7,4 +7,31 @@
+
+ AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
+ AC_CHECK_FUNCS(srandom)
+-AC_OUTPUT(Makefile)
++
++dnl
++dnl Word sizes...
++dnl
++if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
++ # if cross-compiling, with no cached values, just assume something
common.
++ ac_cv_sizeof_short=2
++ ac_cv_sizeof_int=4
++ ac_cv_sizeof_long=4
++ ac_cv_sizeof_long_long=8
++ AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming
short=2, int=4, long=4, long long=8])
++fi
++AC_CHECK_SIZEOF(short)
++AC_CHECK_SIZEOF(int)
++AC_CHECK_SIZEOF(long)
++AC_CHECK_SIZEOF(long long)
++SIZEOF_SHORT=$ac_cv_sizeof_short
++SIZEOF_INT=$ac_cv_sizeof_int
++SIZEOF_LONG=$ac_cv_sizeof_long
++SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
++AC_SUBST(SIZEOF_SHORT)
++AC_SUBST(SIZEOF_INT)
++AC_SUBST(SIZEOF_LONG)
++AC_SUBST(SIZEOF_LONG_LONG)
++AC_C_BIGENDIAN
++
++AC_OUTPUT(Makefile uuid_types.h)
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libuuid/libuuid.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 libuuid.spec
--- openpkg-src/libuuid/libuuid.spec 7 Jan 2005 08:28:38 -0000 1.7
+++ openpkg-src/libuuid/libuuid.spec 10 Feb 2005 09:28:30 -0000 1.8
@@ -33,8 +33,8 @@
Class: EVAL
Group: Text
License: LGPL
-Version: 1.35
-Release: 20050107
+Version: 1.36
+Release: 20050210
# list of sources
Source0:
http://osdn.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -43,7 +43,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, autoconf
+BuildPreReq: OpenPKG, openpkg >= 20040130, autoconf, make
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
