head 1.4; access; symbols OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3.2.2 OPENPKG_E1_FP:1.3.2.2 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.3.2.2 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_CW_FP:1.2; locks; strict; comment @# @; 1.4 date 2009.09.18.08.30.08; author rse; state Exp; branches; next 1.3; commitid EcV3zxLXJCcZz84u; 1.3 date 2006.05.30.13.05.27; author rse; state Exp; branches 1.3.2.1; next 1.2; commitid PdKCQy6VqXJQT2zr; 1.2 date 2005.02.10.09.28.30; author rse; state Exp; branches; next 1.1; 1.1 date 2004.01.06.13.51.15; author rse; state Exp; branches; next ; 1.3.2.1 date 2006.05.30.13.05.27; author rse; state dead; branches; next 1.3.2.2; commitid iZxwRSmmWscPXUQr; 1.3.2.2 date 2006.10.16.14.52.11; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.4 log @upgrading package: libuuid 1.41.4 -> 1.41.9 @ text @Index: lib/uuid/Makefile.in --- lib/uuid/Makefile.in.orig 2009-08-13 03:39:57 +0200 +++ lib/uuid/Makefile.in 2009-09-18 09:27:03 +0200 @@@@ -1,14 +1,20 @@@@ # 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@@ VPATH = @@srcdir@@ top_builddir = ../.. my_dir = lib/uuid -INSTALL = @@INSTALL@@ - -@@MCONFIG@@ +E=@@echo +Q= all:: @@@@ -53,21 +59,15 @@@@ BSDLIB_MYDIR = uuid BSDLIB_INSTALL_DIR = $(root_libdir) -@@MAKEFILE_LIBRARY@@ -@@MAKEFILE_ELF@@ -@@MAKEFILE_BSDLIB@@ -@@MAKEFILE_PROFILE@@ -@@MAKEFILE_CHECKER@@ - .c.o: $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@@ -@@PROFILE_CMT@@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@@CHECKER_CMT@@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@@ELF_CMT@@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@@BSDLIB_CMT@@ $(Q) $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< -all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc +libuuid.a: $(OBJS) + ar cr libuuid.a $(OBJS) + ranlib libuuid.a + +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 @@@@ -172,15 +172,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 - -$(OBJS): subdirs - # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in Index: lib/uuid/configure.in --- lib/uuid/configure.in.orig 2009-08-13 03:39:57 +0200 +++ lib/uuid/configure.in 2009-09-18 09:26:44 +0200 @@@@ -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/gen_uuid.c --- lib/uuid/gen_uuid.c.orig 2009-08-13 03:39:57 +0200 +++ lib/uuid/gen_uuid.c 2009-09-18 09:28:51 +0200 @@@@ -53,6 +53,7 @@@@ #include #include #include +#include #include #ifdef HAVE_SYS_TIME_H #include @ 1.3 log @upgrading package: libuuid 1.38 -> 1.39 @ text @d2 3 a4 3 --- lib/uuid/Makefile.in.orig 2005-12-30 04:19:32 +0100 +++ lib/uuid/Makefile.in 2006-05-30 15:03:48 +0200 @@@@ -1,14 +1,18 @@@@ d23 2 d28 1 a28 1 @@@@ -53,24 +57,15 @@@@ d39 7 a45 7 @@echo " CC $<" @@$(CC) $(ALL_CFLAGS) -c $< -o $@@ -@@PROFILE_CMT@@ @@$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@@CHECKER_CMT@@ @@$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@@ELF_CMT@@ @@$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@@BSDLIB_CMT@@ @@$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - a46 3 -$(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 d53 3 a55 3 tst_uuid.o: $(srcdir)/tst_uuid.c @@echo " CC $@@" @@@@ -172,15 +167,6 @@@@ d72 2 a73 2 --- lib/uuid/configure.in.orig 2005-09-06 11:40:14 +0200 +++ lib/uuid/configure.in 2006-05-30 15:02:49 +0200 d107 11 @ 1.3.2.1 log @file libuuid.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:11 +0000 @ text @d1 107 @ 1.3.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 107 Index: lib/uuid/Makefile.in --- lib/uuid/Makefile.in.orig 2005-12-30 04:19:32 +0100 +++ lib/uuid/Makefile.in 2006-05-30 15:03:48 +0200 @@@@ -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@@ VPATH = @@srcdir@@ top_builddir = ../.. my_dir = lib/uuid -INSTALL = @@INSTALL@@ - -@@MCONFIG@@ all:: @@@@ -53,24 +57,15 @@@@ BSDLIB_MYDIR = uuid BSDLIB_INSTALL_DIR = $(root_libdir) -@@MAKEFILE_LIBRARY@@ -@@MAKEFILE_ELF@@ -@@MAKEFILE_BSDLIB@@ -@@MAKEFILE_PROFILE@@ -@@MAKEFILE_CHECKER@@ - .c.o: @@echo " CC $<" @@$(CC) $(ALL_CFLAGS) -c $< -o $@@ -@@PROFILE_CMT@@ @@$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@@CHECKER_CMT@@ @@$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@@ELF_CMT@@ @@$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@@BSDLIB_CMT@@ @@$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $< - -all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc -$(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 + +all:: tst_uuid uuid_time $(SMANPAGES) tst_uuid.o: $(srcdir)/tst_uuid.c @@echo " CC $@@" @@@@ -172,15 +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 - -$(OBJS): subdirs - # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in Index: lib/uuid/configure.in --- lib/uuid/configure.in.orig 2005-09-06 11:40:14 +0200 +++ lib/uuid/configure.in 2006-05-30 15:02:49 +0200 @@@@ -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) + @ 1.2 log @upgrading package: libuuid 1.35 -> 1.36 @ text @d2 2 a3 2 --- lib/uuid/Makefile.in.orig 2005-02-05 21:48:48 +0100 +++ lib/uuid/Makefile.in 2005-02-10 09:56:44 +0100 d56 1 a56 1 @@@@ -172,13 +167,6 @@@@ d67 2 d72 3 a74 2 --- lib/uuid/configure.in.orig 2003-12-07 18:11:38 +0100 +++ lib/uuid/configure.in 2005-02-10 09:55:37 +0100 @ 1.1 log @new package: libuuid 1.34 (Universally Unique Identifiers (UUID) Library) @ text @a0 36 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) + d2 5 a6 5 --- 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 d13 1 d26 1 a26 1 @@@@ -66,26 +69,14 @@@@ a30 1 -@@MAKEFILE_DLL@@ d37 8 a44 7 $(CC) $(ALL_CFLAGS) -c $< -o $@@ -@@PROFILE_CMT@@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -@@CHECKER_CMT@@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< -@@DLL_CMT@@ (export JUMP_DIR=`pwd`/jump; $(CC) -B$(JUMP_PREFIX) $(ALL_CFLAGS) \ -@@DLL_CMT@@ -o jump/$*.o -c $<) -@@ELF_CMT@@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< -@@BSDLIB_CMT@@ $(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $< d46 2 a47 1 -all:: tst_uuid uuid_time $(SMANPAGES) d51 1 a51 3 -$(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 d55 5 a59 6 $(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 - d66 1 a66 1 d69 36 @