Author: sparky Date: Thu Feb 10 22:33:55 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- changed versionsort->alphasort remap hack to a nicer function check + #ifdef
---- Files affected:
packages/util-linux-ng:
util-linux-diet.patch (1.4 -> 1.5) , util-linux-ng.spec (1.86 -> 1.87)
---- Diffs:
================================================================
Index: packages/util-linux-ng/util-linux-diet.patch
diff -u packages/util-linux-ng/util-linux-diet.patch:1.4
packages/util-linux-ng/util-linux-diet.patch:1.5
--- packages/util-linux-ng/util-linux-diet.patch:1.4 Thu Feb 10 22:31:08 2011
+++ packages/util-linux-ng/util-linux-diet.patch Thu Feb 10 23:33:49 2011
@@ -149,11 +149,12 @@
--- util-linux-2.19/configure.ac~ 2011-02-10 21:28:23.395401725 +0100
+++ util-linux-2.19/configure.ac 2011-02-10 22:12:29.997898392 +0100
-@@ -188,6 +188,7 @@
+@@ -188,6 +188,8 @@
lchown \
llseek \
lseek64 \
+ mkostemp \
++ versionsort \
strtoull \
sysconf \
getdtablesize \
@@ -177,3 +178,20 @@
#include "nls.h"
#define SCRIPT_MIN_DELAY 0.0001 /* from original sripreplay.pl
*/
+--- util-linux-2.19/shlibs/mount/src/tab_parse.c~ 2011-02-10
23:28:02.091461025 +0100
++++ util-linux-2.19/shlibs/mount/src/tab_parse.c 2011-02-10
23:29:04.934794359 +0100
+@@ -422,7 +422,13 @@
+
+ /* TODO: it would be nice to have a scandir() implementaion that
+ * is able to use already opened directory */
+- n = scandir(dirname, &namelist, NULL, versionsort);
++ n = scandir(dirname, &namelist, NULL,
++#ifdef HAVE_VERSIONSORT
++ versionsort
++#else
++ alphasort
++#endif
++ );
+ if (n <= 0)
+ return 0;
+
================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.86
packages/util-linux-ng/util-linux-ng.spec:1.87
--- packages/util-linux-ng/util-linux-ng.spec:1.86 Thu Feb 10 22:48:43 2011
+++ packages/util-linux-ng/util-linux-ng.spec Thu Feb 10 23:33:49 2011
@@ -663,11 +663,10 @@
for dir in shlibs/* disk-utils misc-utils fsck fdisk schedutils hwclock; do
%{__make} -C $dir \
%if %{with uClibc}
- CPPFLAGS="$CPPFLAGS -Dversionsort=alphasort" \
LDFLAGS="-Wl,-static"
%endif
%if %{with dietlibc}
- CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE -Dversionsort=alphasort" \
+ CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE" \
LDFLAGS="-lcompat"
%endif
# empty line required because there is a backslash up there
@@ -1407,6 +1406,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.87 2011/02/10 22:33:49 sparky
+- changed versionsort->alphasort remap hack to a nicer function check + #ifdef
+
Revision 1.86 2011/02/10 21:48:43 sparky
- link uClibc versions statically
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-diet.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.86&r2=1.87&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
