update to hal-0.5.12

This commit is contained in:
Stephan Raue 2009-05-13 01:36:00 +02:00
parent a96da0e28e
commit a363cc5a0c
6 changed files with 76 additions and 5 deletions

View File

@ -10,15 +10,12 @@ $SCRIPTS/build expat
$SCRIPTS/build glib
$SCRIPTS/build dbus
$SCRIPTS/build dbus-glib
$SCRIPTS/build util-linux-ng
export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include"
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib"
cd $BUILD/$1*
# --exec-prefix=/usr \
# --datadir=/usr/share \
# --localstatedir=/var \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \

View File

@ -1 +1 @@
http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.bz2
http://hal.freedesktop.org/releases/hal-0.5.12.tar.bz2

View File

@ -0,0 +1,15 @@
#!/bin/sh
. config/options
$SCRIPTS/build toolchain
cd $BUILD/$1*
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--with-fsprobe=builtin
make -C libs/blkid
$MAKEINSTALL -C libs/blkid

View File

@ -0,0 +1,11 @@
diff -Naur util-linux-ng-2.15/libs/blkid/src/blkidP.h util-linux-ng-2.15.patch/libs/blkid/src/blkidP.h
--- util-linux-ng-2.15/libs/blkid/src/blkidP.h 2009-04-20 11:47:23.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/blkidP.h 2009-05-13 01:21:17.353831636 +0200
@@ -18,6 +18,7 @@
#include <sys/types.h>
#include <stdio.h>
+#include <stdarg.h>
#include "bitops.h" /* $(top_srcdir)/include/ */
#include "blkid.h"

View File

@ -0,0 +1,47 @@
diff -Naur util-linux-ng-2.15/libs/blkid/blkid.pc.in util-linux-ng-2.15.patch/libs/blkid/blkid.pc.in
--- util-linux-ng-2.15/libs/blkid/blkid.pc.in 2009-05-05 21:16:46.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/blkid.pc.in 2009-05-13 01:31:30.223830997 +0200
@@ -6,6 +6,5 @@
Name: blkid
Description: Block device id library
Version: @LIBBLKID_VERSION@
-Requires.private: uuid
Cflags: -I${includedir}/blkid
Libs: -L${libdir} -lblkid
diff -Naur util-linux-ng-2.15/libs/blkid/src/config.c util-linux-ng-2.15.patch/libs/blkid/src/config.c
--- util-linux-ng-2.15/libs/blkid/src/config.c 2009-04-20 11:47:46.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/config.c 2009-05-13 01:23:18.578582126 +0200
@@ -24,9 +24,6 @@
#include <errno.h>
#endif
#include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
#include <stdarg.h>
#include "blkdev.h"
diff -Naur util-linux-ng-2.15/libs/blkid/src/evaluate.c util-linux-ng-2.15.patch/libs/blkid/src/evaluate.c
--- util-linux-ng-2.15/libs/blkid/src/evaluate.c 2009-05-05 21:16:46.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/evaluate.c 2009-05-13 01:23:30.362581321 +0200
@@ -27,9 +27,6 @@
#include <errno.h>
#endif
#include <stdint.h>
-#ifdef HAVE_LIBUUID
-#include <uuid/uuid.h>
-#endif
#include <stdarg.h>
#include "pathnames.h"
diff -Naur util-linux-ng-2.15/libs/blkid/src/read.c util-linux-ng-2.15.patch/libs/blkid/src/read.c
--- util-linux-ng-2.15/libs/blkid/src/read.c 2009-04-20 11:48:57.000000000 +0200
+++ util-linux-ng-2.15.patch/libs/blkid/src/read.c 2009-05-13 01:23:51.666581008 +0200
@@ -25,7 +25,6 @@
#endif
#include "blkidP.h"
-#include "uuid/uuid.h"
#ifdef HAVE_STRTOULL
#define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */

View File

@ -0,0 +1 @@
http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2