diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-18 14:22:30 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-18 14:22:30 +0000 |
| commit | 4bcbf87c99589433bfc0d39ad4e1b4b28bc8a15d (patch) | |
| tree | ed53ad789985a6d077b1d1c3f16c143754367259 | |
| parent | 675b479c2f84b14aad70b1728fa690b2e400d7ea (diff) | |
| download | buildroot-novena-4bcbf87c99589433bfc0d39ad4e1b4b28bc8a15d.tar.gz buildroot-novena-4bcbf87c99589433bfc0d39ad4e1b4b28bc8a15d.zip | |
lsof, m4: use variables from BR instead of uclibc
UCLIB_HAS_.* is not defined in Buildroot space, so the conditions always
evaluate to the same result. Use appropriate Buildroot variables.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
| -rw-r--r-- | package/lsof/lsof.mk | 4 | ||||
| -rw-r--r-- | package/m4/m4.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 8551a41df..c998d8b06 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -38,11 +38,11 @@ $(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked touch $(LSOF_DIR)/.configured $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured -ifeq ($(UCLIBC_HAS_WCHAR),) +ifeq ($(BR2_USE_WCHAR),) $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h $(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h endif -ifeq ($(UCLIBC_HAS_LOCALE),) +ifeq ($(BR2_ENABLE_LOCALE),) $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h endif $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src diff --git a/package/m4/m4.mk b/package/m4/m4.mk index b7bfe9353..bef968e46 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -15,7 +15,7 @@ M4_TARGET_BINARY:=usr/bin/m4 ifeq ($(UCLIBC_HAS_REGEX),y) gl_cv_func_re_compile_pattern_working=gl_cv_func_re_compile_pattern_working=yes endif -ifneq ($(UCLIBC_HAS_WCHAR),y) +ifneq ($(BR2_USE_WCHAR),y) gt_cv_c_wchar_t=gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=gl_cv_absolute_wchar_h=__fpending.h endif |