packages/busybox/regex.patch

   1 Index: busybox-1.1.3/libbb/Makefile.in
   2 ===================================================================
   3 --- busybox-1.1.3.orig/libbb/Makefile.in        2006-08-27 18:47:30.000000000 -0600
   4 +++ busybox-1.1.3/libbb/Makefile.in     2006-08-27 18:52:49.000000000 -0600
   5 @@ -29,7 +29,7 @@
   6         safe_strncpy.c setup_environment.c sha1.c simplify_path.c \
   7         trim.c u_signal_names.c vdprintf.c verror_msg.c \
   8         vherror_msg.c vperror_msg.c wfopen.c xconnect.c xgetcwd.c xstat.c \
   9 -       xgethostbyname.c xgethostbyname2.c xreadlink.c xregcomp.c xgetlarg.c \
  10 +       xgethostbyname.c xgethostbyname2.c xreadlink.c xgetlarg.c \
  11         get_terminal_width_height.c fclose_nonstdin.c fflush_stdout_and_exit.c \
  12         getopt_ulflags.c default_error_retval.c wfopen_input.c speed_table.c \
  13         perror_nomsg_and_die.c perror_nomsg.c skip_whitespace.c bb_askpass.c \
  14 @@ -48,6 +48,19 @@
  15  LIBBB-$(CONFIG_SU)+= correct_password.c
  16  LIBBB-$(CONFIG_LOGIN)+= correct_password.c
  17
  18 +# We shouldn't build xregcomp.c if we don't need it - this ensures we don't
  19 +# require regex.h to be in the include dir even if we don't need it thereby
  20 +# allowing us to build busybox even if uclibc regex support is disabled.
  21 +
  22 +regex-y=
  23 +
  24 +regex-$(CONFIG_AWK) += xregcomp.c
  25 +regex-$(CONFIG_SED) += xregcomp.c
  26 +regex-$(CONFIG_LESS) += xregcomp.c
  27 +regex-$(CONFIG_DEVFSD) += xregcomp.c
  28 +
  29 +# Sort has the happy side efect of returning a unique list
  30 +LIBBB-y += $(sort $(regex-y))
  31
  32  LIBBB-y:=$(patsubst %,$(srcdir)/%,$(LIBBB-y))
  33