From f1bcdf518fa7868b7819b0248f4b8da02a954dde Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 19 Sep 2007 12:20:52 +0000 Subject: - fix incorrect setting of $ac_cv_sys_symbol_underscore. There is no reason not to AC_COMPILE and use the set cross-nm to look for the symbol mangling scheme. Thus it is incorrect to check for cross compilation in the GNUPG_SYS_SYMBOL_UNDERSCORE check. - fix bug when configuring (has to wipe config.cache !) --- package/libgcrypt/libgcrypt.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'package/libgcrypt/libgcrypt.mk') diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 8436222af..8f145bad5 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -18,12 +18,16 @@ $(LIBGCRYPT_DIR)/.source: $(DL_DIR)/$(LIBGCRYPT_SOURCE) $(BZCAT) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(LIBGCRYPT_DIR) package/libgcrypt/ libgcrypt\*.patch $(CONFIG_UPDATE) $(LIBGCRYPT_DIR) + # This is incorrectly hardwired to yes for cross-compiles with no + # sane way to pass pre-existing knowledge so fix it with the chainsaw.. + $(SED) '/GNUPG_SYS_SYMBOL_UNDERSCORE/d' $(LIBGCRYPT_DIR)/configure touch $@ $(LIBGCRYPT_DIR)/.configured: $(LIBGCRYPT_DIR)/.source - (cd $(LIBGCRYPT_DIR); \ + (cd $(LIBGCRYPT_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ + ac_cv_sys_symbol_underscore=no \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -41,7 +45,6 @@ $(LIBGCRYPT_DIR)/.configured: $(LIBGCRYPT_DIR)/.source --mandir=/usr/man \ --infodir=/usr/info \ --disable-optimization \ - --with-capabilities \ ) touch $@ -- cgit v1.2.3