dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

various configure related cleanups

Browse Source 
SVN-Revision: 6372
v19.07.3_mercusys_ac12_duma
Felix Fietkau 18 years ago
parent 7ae75032c1
commit d6299cafc8
8 changed files with 49 additions and 134 deletions
Show Stats Download Patch File Download Diff File

6
package/bridge/Makefile
Unescape Escape View File

@ -31,11 +31,7 @@ define Package/bridge
URL:=http://bridge.sourceforge.net/ URL:=http://bridge.sourceforge.net/
endef endef
define Build/Configure CONFIGURE_ARGS += --with-linux-headers="$(LINUX_DIR)"
$(call Build/Configure/Default, \
--with-linux-headers="$(LINUX_DIR)" \
)
endef
define Package/bridge/install define Package/bridge/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin

35
package/dropbear/Makefile
Unescape Escape View File

@ -41,32 +41,7 @@ define Package/dropbearconvert
TITLE:=Utility for converting SSH keys TITLE:=Utility for converting SSH keys
endef endef
define Build/Configure CONFIGURE_ARGS += \
$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
./configure \
--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) \
--with-shared \ --with-shared \
--disable-pam \ --disable-pam \
--enable-openpty \ --enable-openpty \
@ -80,8 +55,12 @@ define Build/Configure
--disable-loginfunc \ --disable-loginfunc \
--disable-pututline \ --disable-pututline \
--disable-pututxline \ --disable-pututxline \
--disable-zlib \ --disable-zlib
);
define Build/Configure
$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
$(call Build/Configure/Default)
endef endef
define Build/Compile define Build/Compile

7
package/e2fsprogs/Makefile
Unescape Escape View File

@ -47,15 +47,12 @@ define Package/resize2fs
DEPENDS:=e2fsprogs DEPENDS:=e2fsprogs
endef endef
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-rpath \ --disable-rpath \
--enable-elf-shlibs \ --enable-elf-shlibs \
--enable-dynamic-e2fsck \ --enable-dynamic-e2fsck
)
endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/util \ $(MAKE) -C $(PKG_BUILD_DIR)/util \

9
package/gmp/Makefile
Unescape Escape View File

@ -29,13 +29,10 @@ define Package/libgmp
URL:=http://www.swox.com/gmp/ URL:=http://www.swox.com/gmp/
endef endef
define Build/Configure CONFIGURE_VARS += CC="$(TARGET_CROSS)gcc"
$(call Build/Configure/Default, \ CONFIGURE_ARGS += \
--enable-shared \ --enable-shared \
--enable-static, \ --enable-static \
CC="$(TARGET_CROSS)gcc" \
)
endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default, \ $(call Build/Compile/Default, \

21
package/ipsec-tools/Makefile
Unescape Escape View File

@ -31,15 +31,7 @@ define Package/ipsec-tools
URL:=http://ipsec-tools.sourceforge.net/ URL:=http://ipsec-tools.sourceforge.net/
endef endef
define Build/Configure CONFIGURE_ARGS += \
(cd $(PKG_BUILD_DIR); touch \
configure.ac \
aclocal.m4 \
Makefile.in \
config.h.in \
configure \
);
$(call Build/Configure/Default, \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--with-kernel-headers="$(LINUX_DIR)/include" \ --with-kernel-headers="$(LINUX_DIR)/include" \
@ -48,8 +40,17 @@ define Build/Configure
--without-libradius \ --without-libradius \
--without-libpam \ --without-libpam \
--enable-dpd \ --enable-dpd \
--enable-natt \ --enable-natt
define Build/Configure
(cd $(PKG_BUILD_DIR); touch \
configure.ac \
aclocal.m4 \
Makefile.in \
config.h.in \
configure \
); );
$(call Build/Configure/Default)
endef endef
# override CFLAGS holding "-Werror" that break builds on compile warnings # override CFLAGS holding "-Werror" that break builds on compile warnings

25
package/kexec-tools/Makefile
Unescape Escape View File

@ -33,31 +33,6 @@ define Package/kexec-tools
URL:=http://www.xmission.com/~ebiederm/files/kexec/README URL:=http://www.xmission.com/~ebiederm/files/kexec/README
endef endef
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--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 \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
);
endef
define Build/Compile define Build/Compile
rm -rf $(PKG_INSTALL_DIR) rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)

7
package/keynote/Makefile
Unescape Escape View File

@ -35,12 +35,9 @@ define Package/keynote
URL:=http://www1.cs.columbia.edu/~angelos/keynote.html URL:=http://www1.cs.columbia.edu/~angelos/keynote.html
endef endef
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \
--enable-static \ --enable-static \
--enable-shared \ --enable-shared
)
endef
define Build/Compile define Build/Compile
$(call Build/Compile/Default, \ $(call Build/Compile/Default, \

31
package/libpcap/Makefile
Unescape Escape View File

@ -32,40 +32,13 @@ define Package/libpcap
URL:=http://www.tcpdump.org/ URL:=http://www.tcpdump.org/
endef endef
define Build/Configure CONFIGURE_ARGS += \
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
./configure \
--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_NLS) \
$(DISABLE_LARGEFILE) \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
--disable-yydebug \ --disable-yydebug \
--enable-ipv6 \ --enable-ipv6 \
--with-build-cc="$(HOSTCC)" \ --with-build-cc="$(HOSTCC)" \
--with-pcap=linux \ --with-pcap=linux
);
endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \

Write Preview
Loading…
Cancel
Save