summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2006-04-30 18:38:02 +0000
committerNicolas Thill <nico@openwrt.org>2006-04-30 18:38:02 +0000
commitb29f32645c4b708191bce246258dc7103711ea1a (patch)
tree55e929b6a49654f84683da2f93cfe56f5fd413e2
parent6cddb03df284dc09124fac50bb6a77a9247216b8 (diff)
downloadmtk-20170518-b29f32645c4b708191bce246258dc7103711ea1a.zip
mtk-20170518-b29f32645c4b708191bce246258dc7103711ea1a.tar.gz
mtk-20170518-b29f32645c4b708191bce246258dc7103711ea1a.tar.bz2
fix build on x86 (--disable-asm), standardize.
SVN-Revision: 3716
-rw-r--r--openwrt/package/gpg/Makefile70
1 files changed, 38 insertions, 32 deletions
diff --git a/openwrt/package/gpg/Makefile b/openwrt/package/gpg/Makefile
index ca7e146..f9769e3 100644
--- a/openwrt/package/gpg/Makefile
+++ b/openwrt/package/gpg/Makefile
@@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnupg
PKG_VERSION:=1.4.2.1
PKG_RELEASE:=1
+PKG_MD5SUM:=2d59ed50d92f69994dbfbe00fe1612e4
PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
ftp://ftp.gnupg.org/gcrypt/gnupg
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5:=2d59ed50d92f69994dbfbe00fe1612e4
PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -21,40 +21,46 @@ $(eval $(call PKG_template,GPG,gpg,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
ac_cv_c_bigendian=no \
ac_cv_sizeof_off_t=8 \
./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --program-prefix="" \
- --disable-gnupg-iconv \
- --disable-card-support \
- --disable-agent-support \
- --disable-bzip2 \
- --disable-exec \
- --disable-ldap \
- --disable-hkp \
- --disable-finger \
- --disable-ftp \
- --disable-largefile \
- --disable-dns-srv \
- --enable-fake-curl \
- --disable-nls \
- --disable-rpath \
- --disable-regex \
- $(DISABLE_NLS) \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_LARGEFILE) \
+ $(DISABLE_NLS) \
+ --disable-asm \
+ --disable-gnupg-iconv \
+ --disable-card-support \
+ --disable-agent-support \
+ --disable-bzip2 \
+ --disable-exec \
+ --disable-ldap \
+ --disable-hkp \
+ --disable-finger \
+ --disable-ftp \
+ --disable-dns-srv \
+ --enable-fake-curl \
+ --disable-nls \
+ --disable-rpath \
+ --disable-regex \
);
touch $@