svn commit: trunk/busybox: editors
vda at busybox.net
vda at busybox.net
Fri Oct 27 09:05:40 UTC 2006
Author: vda
Date: 2006-10-27 02:05:40 -0700 (Fri, 27 Oct 2006)
New Revision: 16454
Log:
Fix largefile breakage; advance version to 1.2.2
Modified:
trunk/busybox/Makefile
trunk/busybox/editors/awk.c
Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile 2006-10-27 09:05:02 UTC (rev 16453)
+++ trunk/busybox/Makefile 2006-10-27 09:05:40 UTC (rev 16454)
@@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 2
-SUBLEVEL = 1
+SUBLEVEL = 2
EXTRAVERSION = .svn
NAME = Unnamed
@@ -302,7 +302,6 @@
CFLAGS :=
CPPFLAGS :=
AFLAGS :=
-include $(srctree)/Makefile.flags
# Read KERNELRELEASE from .kernelrelease (if it exists)
KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
@@ -467,6 +466,9 @@
# To avoid any implicit rule to kick in, define an empty command
.config .kconfig.d: ;
+# Now we can define CFLAGS etc according to .config
+include $(srctree)/Makefile.flags
+
# If .config is newer than include/autoconf.h, someone tinkered
# with it and forgot to run make oldconfig.
# If kconfig.d is missing then we are probarly in a cleaned tree so
Modified: trunk/busybox/editors/awk.c
===================================================================
--- trunk/busybox/editors/awk.c 2006-10-27 09:05:02 UTC (rev 16453)
+++ trunk/busybox/editors/awk.c 2006-10-27 09:05:40 UTC (rev 16454)
@@ -2151,7 +2151,7 @@
L.v = evaluate(nextarg(&op1), v1);
if (L.v->type & VF_NUMBER) {
fmt_num(buf, MAXVARFMT, getvar_s(V[OFMT]),
- getvar_i(L.v), TRUE);
+ getvar_i(L.v), TRUE);
fputs(buf, X.F);
} else {
fputs(getvar_s(L.v), X.F);
@@ -2767,4 +2767,3 @@
return 0;
}
-
More information about the busybox-cvs
mailing list