* [Buildroot] [PATCH 01/19] distcc : convert to autotools infrastructure & bump to 1.1-20100428
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 02/19] dmalloc : convert to autotools infrastructure cmchao
` (18 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/distcc/distcc.mk | 65 ++++++++--------------------------------------
1 files changed, 11 insertions(+), 54 deletions(-)
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index 75cfacc..030fdf7 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -5,67 +5,24 @@
#############################################################
DISTCC_VERSION:=2.18.3
DISTCC_SOURCE:=distcc-$(DISTCC_VERSION).tar.bz2
-DISTCC_CAT:=$(BZCAT)
DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/
-DISTCC_BUILDDIR:=$(BUILD_DIR)/distcc-$(DISTCC_VERSION)
DISTCC_BINARY:=distcc
DISTCC_TARGET_BINARY:=usr/bin/distcc
-$(DL_DIR)/$(DISTCC_SOURCE):
- $(call DOWNLOAD,$(DISTCC_SITE),$(DISTCC_SOURCE))
+DISTCC_INSTALL_STAGING = NO
+DISTCC_INSTALL_TARGET = YES
+DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome
-distcc-source: $(DL_DIR)/$(CVS_SOURCE)
-$(DISTCC_BUILDDIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE)
- $(DISTCC_CAT) $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(DISTCC_BUILDDIR)
- touch $(DISTCC_BUILDDIR)/.unpacked
+define DISTCC_INSTALL_TARGET_CMDS
+ install -D $(@D)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d
+ install -D $(@D)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
+endef
-$(DISTCC_BUILDDIR)/.configured: $(DISTCC_BUILDDIR)/.unpacked
- (cd $(DISTCC_BUILDDIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --with-included-popt \
- --without-gtk \
- --without-gnome \
- )
- touch $(DISTCC_BUILDDIR)/.configured
-
-$(DISTCC_BUILDDIR)/$(DISTCC_BINARY): $(DISTCC_BUILDDIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DISTCC_BUILDDIR)
-
-$(TARGET_DIR)/$(DISTCC_TARGET_BINARY): $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)
- install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY)d $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d
- install -D $(DISTCC_BUILDDIR)/$(DISTCC_BINARY) $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
-
-distcc: $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
-
-distcc-clean:
+define DISTCC_CLEAN_CMDS
rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)
rm -f $(TARGET_DIR)/$(DISTCC_TARGET_BINARY)d
- -$(MAKE) -C $(DISTCC_BUILDDIR) clean
+ -$(MAKE) -C $(@D) clean
+endef
-distcc-dirclean:
- rm -rf $(DISTCC_BUILDDIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DISTCC),y)
-TARGETS+=distcc
-endif
+$(eval $(call AUTOTARGETS,package,distcc))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 02/19] dmalloc : convert to autotools infrastructure
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 01/19] distcc : convert to autotools infrastructure & bump to 1.1-20100428 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 03/19] fbv " cmchao
` (17 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/dmalloc/dmalloc.mk | 95 ++++++++++++--------------------------------
1 files changed, 26 insertions(+), 69 deletions(-)
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index dd83583..bf09868 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -6,100 +6,57 @@
DMALLOC_VERSION:=5.4.3
DMALLOC_SOURCE:=dmalloc-$(DMALLOC_VERSION).tgz
DMALLOC_SITE:=http://dmalloc.com/releases
-DMALLOC_DIR:=$(BUILD_DIR)/dmalloc-$(DMALLOC_VERSION)
-DMALLOC_CAT:=$(ZCAT)
-DMALLOC_BINARY:=dmalloc
DMALLOC_TARGET_BINARY:=usr/bin/dmalloc
-$(DL_DIR)/$(DMALLOC_SOURCE):
- $(call DOWNLOAD,$(DMALLOC_SITE),$(DMALLOC_SOURCE))
-
-dmalloc-source: $(DL_DIR)/$(DMALLOC_SOURCE)
-
-$(DMALLOC_DIR)/.unpacked: $(DL_DIR)/$(DMALLOC_SOURCE)
- $(DMALLOC_CAT) $(DL_DIR)/$(DMALLOC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(DMALLOC_DIR) package/dmalloc dmalloc\*.patch
- $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(DMALLOC_DIR)/configure
- $(SED) 's/(ld -/($${LD-ld} -/' $(DMALLOC_DIR)/configure
- $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(DMALLOC_DIR)/configure
- -$(SED) 's/ar cr/$$(AR) cr/' $(DMALLOC_DIR)/Makefile.in
- touch $@
+DMALLOC_INSTALL_STAGING = YES
+DMALLOC_INSTALL_TARGET = YES
+DMALLOC_CONF_OPT:= --enable-shlib
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-DMALLOC_CONFIG_ARGS:=--enable-cxx
+DMALLOC_CONF_OPT+=--enable-cxx
else
-DMALLOC_CONFIG_ARGS:=--disable-cxx
+DMALLOC_CONF_OPT+=--disable-cxx
endif
ifeq ($(BR2_PTHREADS_NONE),y)
-DMALLOC_CONFIG_ARGS+=--disable-threads
+DMALLOC_CONF_OPT+=--disable-threads
else
-DMALLOC_CONFIG_ARGS+=--enable-threads
+DMALLOC_CONF_OPT+=--enable-threads
endif
+define DMALLOC_POST_PATCH
+ $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure
+ $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure
+ $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure
+ $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in
+endef
+DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH
-$(DMALLOC_DIR)/.configured: $(DMALLOC_DIR)/.unpacked
- (cd $(DMALLOC_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CFLAGS="-g" \
- LDFLAGS="-g" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- --enable-shlib \
- $(DMALLOC_CONFIG_ARGS) \
- )
- touch $@
-
-$(DMALLOC_DIR)/$(DMALLOC_BINARY): $(DMALLOC_DIR)/.configured
- $(MAKE) -C $(DMALLOC_DIR)
-
-$(TARGET_DIR)/$(DMALLOC_TARGET_BINARY): $(DMALLOC_DIR)/$(DMALLOC_BINARY)
- # both DESTDIR and PREFIX are ignored..
+# both DESTDIR and PREFIX are ignored..
+define DMALLOC_INSTALL_STAGING_CMDS
$(MAKE) includedir="$(STAGING_DIR)/usr/include" \
bindir="$(STAGING_DIR)/usr/bin" \
libdir="$(STAGING_DIR)/usr/lib" \
shlibdir="$(STAGING_DIR)/usr/lib" \
includedir="$(STAGING_DIR)/usr/share/info/" \
- -C $(DMALLOC_DIR) install
- (cd $(STAGING_DIR)/usr/lib; \
- mv libdmalloc*.so $(TARGET_DIR)/usr/lib)
- cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
+ -C $(@D) install
+endef
+
+define DMALLOC_INSTALL_TARGET_CMDS
+ mv $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib
+ cp -dpf $(STAGING_DIR)/$(DMALLOC_TARGET_BINARY) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
+endef
-dmalloc: $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
-dmalloc-clean:
+define DMALLOC_CLEAN_CMDS
-rm -f $(TARGET_DIR)/usr/lib/libdmalloc*
-rm -f $(STAGING_DIR)/usr/lib/libdmalloc*
rm -f $(STAGING_DIR)/usr/include/dmalloc.h
rm -f $(TARGET_DIR)/$(DMALLOC_TARGET_BINARY)
-$(MAKE) -C $(DMALLOC_DIR) clean
-
-dmalloc-dirclean:
- rm -rf $(DMALLOC_DIR)
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DMALLOC),y)
-TARGETS+=dmalloc
-endif
+$(eval $(call AUTOTARGETS,package,dmalloc))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 03/19] fbv : convert to autotools infrastructure
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 01/19] distcc : convert to autotools infrastructure & bump to 1.1-20100428 cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 02/19] dmalloc : convert to autotools infrastructure cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 04/19] links : convert to autotools infrastructure & bump to 1.01pre1-no-ssl cmchao
` (16 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/fbv/fbv.mk | 50 +++++++++++++++++---------------------------------
1 files changed, 17 insertions(+), 33 deletions(-)
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index 44ce5c6..81ff40c 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -6,23 +6,15 @@
FBV_VERSION:=1.0b
FBV_SOURCE:=fbv-$(FBV_VERSION).tar.gz
FBV_SITE:=http://s-tech.elsat.net.pl/fbv
-FBV_DIR:=$(BUILD_DIR)/fbv-$(FBV_VERSION)
-FBV_CAT:=$(ZCAT)
FBV_BINARY:=fbv
-FBV_TARGET_BINARY:=usr/bin/$(FBV_BINARY)
+FBV_TARGET_BINARY:=usr/bin/fbv
-$(DL_DIR)/$(FBV_SOURCE):
- $(call DOWNLOAD,$(FBV_SITE),$(FBV_SOURCE))
+FBV_INSTALL_STAGING = NO
+FBV_INSTALL_TARGET = YES
+FBV_DEPENDENCIES = libpng jpeg libungif
-fbv-source: $(DL_DIR)/$(FBV_SOURCE)
-
-$(FBV_DIR)/.unpacked: $(DL_DIR)/$(FBV_SOURCE)
- $(FBV_CAT) $(DL_DIR)/$(FBV_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FBV_DIR) package/fbv/ \
- fbv-$(FBV_VERSION)\*.patch fbv-$(FBV_VERSION)\*.patch.$(ARCH)
- touch $@
-
-$(FBV_DIR)/.configured: $(FBV_DIR)/.unpacked
+#fbv donesn't support cross-compilation
+define FBV_CONFIGURE_CMDS
(cd $(FBV_DIR); rm -f config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
@@ -30,27 +22,19 @@ $(FBV_DIR)/.configured: $(FBV_DIR)/.unpacked
--prefix=/usr \
--libs="-lz -lm" \
)
- touch $@
+endef
-$(FBV_DIR)/$(FBV_BINARY): $(FBV_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBV_DIR)
+define FBV_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
-$(TARGET_DIR)/$(FBV_TARGET_BINARY): $(FBV_DIR)/$(FBV_BINARY)
- install -D $(FBV_DIR)/$(FBV_BINARY) $(TARGET_DIR)/$(FBV_TARGET_BINARY)
+define FBV_INSTALL_TARGET_CMDS
+ install -D $(@D)/$(FBV_BINARY) $(TARGET_DIR)/$(FBV_TARGET_BINARY)
+endef
-fbv: libpng jpeg libungif $(TARGET_DIR)/$(FBV_TARGET_BINARY)
-
-fbv-clean:
+define FBV_CLEAN_CMDS
rm -f $(TARGET_DIR)/$(FBV_TARGET_BINARY)
- -$(MAKE) -C $(FBV_DIR) clean
+ -$(MAKE) -C $(@D) clean
+endef
-fbv-dirclean:
- rm -rf $(FBV_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FBV),y)
-TARGETS+=fbv
-endif
+$(eval $(call AUTOTARGETS,package,fbv))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 04/19] links : convert to autotools infrastructure & bump to 1.01pre1-no-ssl
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (2 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 03/19] fbv " cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 05/19] dialog : convert to autotools infrastructure & bump to 1.1-20100428 cmchao
` (15 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/links/links.mk | 66 +++++++++--------------------------------------
1 files changed, 13 insertions(+), 53 deletions(-)
diff --git a/package/links/links.mk b/package/links/links.mk
index 298c165..b02e801 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -3,64 +3,24 @@
# links (text based web browser)
#
#############################################################
-LINKS_VERSION:=0.99pre9-no-ssl
+LINKS_VERSION:=1.01pre1-no-ssl
LINKS_SITE:=http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/links/download/no-ssl
LINKS_SOURCE:=links-$(LINKS_VERSION).tar.gz
-LINKS_DIR:=$(BUILD_DIR)/links-$(LINKS_VERSION)
-$(DL_DIR)/$(LINKS_SOURCE):
- $(call DOWNLOAD,$(LINKS_SITE),$(LINKS_SOURCE))
+LINKS_INSTALL_STAGING = NO
+LINKS_INSTALL_TARGET = YES
+LINKS_CONF_OPT = --localstatedir=/tmp
-links-source: $(DL_DIR)/$(LINKS_SOURCE)
+define LINKS_INSTALL_TARGET_CMDS
+ install -c $(@D)/links $(TARGET_DIR)/usr/bin/links
+ $(STRIPCMD) $(@D)/links
+endef
-$(LINKS_DIR)/.unpacked: $(DL_DIR)/$(LINKS_SOURCE)
- $(ZCAT) $(DL_DIR)/$(LINKS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(LINKS_DIR)/.unpacked
-
-$(LINKS_DIR)/.configured: $(LINKS_DIR)/.unpacked
- (cd $(LINKS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/tmp \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- )
- touch $(LINKS_DIR)/.configured
-
-$(LINKS_DIR)/links: $(LINKS_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LINKS_DIR)
- $(STRIPCMD) $(LINKS_DIR)/links
-
-$(TARGET_DIR)/usr/bin/links: $(LINKS_DIR)/links
- install -c $(LINKS_DIR)/links $(TARGET_DIR)/usr/bin/links
-
-links-clean:
- -$(MAKE) -C $(LINKS_DIR) clean
+define LINKS_POST_CLEAN
+ -$(MAKE) -C $(@D) clean
rm -f $(TARGET_DIR)/usr/bin/links
+endef
-links-dirclean:
- rm -rf $(LINKS_DIR)
-
-links: $(TARGET_DIR)/usr/bin/links
+LINKS_POST_CLEAN_HOOKS += LINKS_POST_CLEAN
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LINKS),y)
-TARGETS+=links
-endif
+$(eval $(call AUTOTARGETS,package,links))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 05/19] dialog : convert to autotools infrastructure & bump to 1.1-20100428
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (3 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 04/19] links : convert to autotools infrastructure & bump to 1.01pre1-no-ssl cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 06/19] berkeleydb : convert to autotools infrastructure & bump to 4.4.20 cmchao
` (14 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/dialog/dialog.mk | 63 +++++++++------------------------------------
1 files changed, 13 insertions(+), 50 deletions(-)
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 9c6f2a9..c34510a 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -3,59 +3,22 @@
# dialog
#
#############################################################
-DIALOG_VERSION:=1.1-20070704
+DIALOG_VERSION:=1.1-20100428
DIALOG_SOURCE:=dialog-$(DIALOG_VERSION).tgz
DIALOG_SITE:=ftp://invisible-island.net/dialog
-DIALOG_DIR:=$(BUILD_DIR)/dialog-$(DIALOG_VERSION)
-DIALOG_BINARY:=dialog
-DIALOG_TARGET_BINARY:=usr/bin/dialog
-$(DL_DIR)/$(DIALOG_SOURCE):
- $(call DOWNLOAD,$(DIALOG_SITE),$(DIALOG_SOURCE))
+DIALOG_INSTALL_STAGING = NO
+DIALOG_INSTALL_TARGET = YES
+DIALOG_DEPENDENCIES = ncurses
-$(DIALOG_DIR)/.source: $(DL_DIR)/$(DIALOG_SOURCE)
- $(ZCAT) $(DL_DIR)/$(DIALOG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(DIALOG_DIR)
- touch $@
+define DIALOG_INSTALL_TARGET_CMDS
+ install -c $(@D)/dialog $(TARGET_DIR)/usr/bin/dialog
+ $(STRIPCMD) $(@D)/dialog
+endef
-$(DIALOG_DIR)/.configured: $(DIALOG_DIR)/.source
- (cd $(DIALOG_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc; \
- )
- touch $@
+define DIALOG_POST_CLEAN
+ -$(MAKE) -C $(@D) clean
+ rm -f $(TARGET_DIR)/usr/bin/dialog
+endef
-$(DIALOG_DIR)/$(DIALOG_BINARY): $(DIALOG_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(DIALOG_DIR)
- touch -c $@
-
-$(TARGET_DIR)/$(DIALOG_TARGET_BINARY): $(DIALOG_DIR)/$(DIALOG_BINARY)
- $(MAKE) prefix=$(TARGET_DIR)/usr \
- mandir=$(TARGET_DIR)/usr/share/man \
- -C $(DIALOG_DIR) install
-
-dialog: ncurses $(TARGET_DIR)/$(DIALOG_TARGET_BINARY)
-
-dialog-source: $(DL_DIR)/$(DIALOG_SOURCE)
-
-dialog-clean:
- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(DIALOG_DIR) uninstall
- -$(MAKE) -C $(DIALOG_DIR) clean
-
-dialog-dirclean:
- rm -rf $(DIALOG_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DIALOG),y)
-TARGETS+=dialog
-endif
+$(eval $(call AUTOTARGETS,package,dialog))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 06/19] berkeleydb : convert to autotools infrastructure & bump to 4.4.20
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (4 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 05/19] dialog : convert to autotools infrastructure & bump to 1.1-20100428 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 07/19] dash : convert to autotools infrastructure & bump to 0.5.5.1 cmchao
` (13 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/berkeleydb/berkeleydb.mk | 71 +++++++++++++-------------------------
1 files changed, 24 insertions(+), 47 deletions(-)
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index f15df6a..4227f7f 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -3,25 +3,18 @@
# berkeley db
#
#############################################################
-DB_VERSION:=4.3.29
-DB_SO_VERSION:=4.3
-DB_SITE:=ftp://ftp.sleepycat.com/releases
-DB_SOURCE:=db-$(DB_VERSION).NC.tar.gz
-DB_DIR:=$(BUILD_DIR)/db-$(DB_VERSION).NC
-DB_SHARLIB:=libdb-$(DB_SO_VERSION).so
+BERKELEYDB_VERSION:=4.4.20
+BERKELEYDB_SO_VERSION:=4.4
+BERKELEYDB_SITE:=ftp://ftp.sleepycat.com/releases
+BERKELEYDB_SOURCE:=db-$(BERKELEYDB_VERSION).NC.tar.gz
+BERKELEYDB_SHARLIB:=libdb-$(BERKELEYDB_SO_VERSION).so
-$(DL_DIR)/$(DB_SOURCE):
- $(call DOWNLOAD,$(DB_SITE),$(DB_SOURCE))
+BERKELEYDB_INSTALL_STAGING = YES
+BERKELEYDB_INSTALL_TARGET = YES
-berkeleydb-source: $(DL_DIR)/$(DB_SOURCE)
-
-$(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
- $(ZCAT) $(DL_DIR)/$(DB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(DB_DIR)/.configured: $(DB_DIR)/.dist
- $(CONFIG_UPDATE) $(DB_DIR)/dist
- (cd $(DB_DIR)/build_unix; rm -rf config.cache; \
+#build directory can't be the directory where configure are there, so..
+define BERKELEYDB_CONFIGURE_CMDS
+ (cd $(@D)/build_unix; rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
../dist/configure $(QUIET) \
@@ -48,48 +41,32 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
--disable-tcl \
--disable-compat185 \
--with-pic \
- $(DISABLE_LARGEFILE) \
)
- $(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
- touch $@
+ $(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile
+endef
-$(DB_DIR)/build_unix/.libs/$(DB_SHARLIB): $(DB_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix
+define BERKELEYDB_BUILD_CMDS
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D)/build_unix
+endef
-$(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DB_DIR)/build_unix install
+define BERKELEYDB_INSTALL_STAGING_CMDS
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D)/build_unix install
chmod a-x $(STAGING_DIR)/lib/libdb*so*
rm -f $(STAGING_DIR)/bin/db_*
rm -rf $(STAGING_DIR)/share/locale
+endef
-$(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
+define BERKELEYDB_INSTALL_TARGET_CMDS
rm -rf $(TARGET_DIR)/lib/libdb*
cp -a $(STAGING_DIR)/lib/libdb*so* $(TARGET_DIR)/lib/
rm -f $(addprefix $(TARGET_DIR)/lib/,libdb.so libdb.la libdb.a)
- (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so)
+ (cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(BERKELEYDB_SHARLIB) libdb.so)
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdb*so*
-
-$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a
+ mkdir -p $(TARGET_DIR)/usr/include
cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/
+ mkdir -p $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/lib/libdb*.a $(TARGET_DIR)/usr/lib/
cp -dpf $(STAGING_DIR)/lib/libdb*.la $(TARGET_DIR)/usr/lib/
- touch -c $@
-
-berkeleydb-headers: $(TARGET_DIR)/usr/lib/libdb.a
-
-berkeleydb-clean:
- -$(MAKE) -C $(DB_DIR)/build_unix clean
-
-berkeleydb-dirclean:
- rm -rf $(DB_DIR)
+endef
-berkeleydb: $(TARGET_DIR)/lib/$(DB_SHARLIB)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
-TARGETS+=berkeleydb
-endif
+$(eval $(call AUTOTARGETS,package,berkeleydb))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 07/19] dash : convert to autotools infrastructure & bump to 0.5.5.1
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (5 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 06/19] berkeleydb : convert to autotools infrastructure & bump to 4.4.20 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 08/19] diffutils : convert to autotools infrastructure cmchao
` (12 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/dash/dash.mk | 71 ++++++++++----------------------------------------
1 files changed, 14 insertions(+), 57 deletions(-)
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 63a102a..1f229de 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -3,71 +3,28 @@
# dash
#
#############################################################
-DASH_VERSION:=0.5.3
+DASH_VERSION:=0.5.5.1
DASH_SOURCE:=dash_$(DASH_VERSION).orig.tar.gz
DASH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/d/dash
-DASH_CAT:=$(ZCAT)
-DASH_DIR:=$(BUILD_DIR)/dash-$(DASH_VERSION)
-DASH_PATCH1:=dash_$(DASH_VERSION)-7.diff.gz
+DASH_PATCH:=dash_$(DASH_VERSION)-6.diff.gz
DASH_BINARY:=src/dash
DASH_TARGET_BINARY:=bin/dash
-$(DL_DIR)/$(DASH_SOURCE):
- $(call DOWNLOAD,$(DASH_SITE),$(DASH_SOURCE))
+DASH_INSTALL_STAGING = NO
+DASH_INSTALL_TARGET = YES
-$(DL_DIR)/$(DASH_PATCH1):
- $(call DOWNLOAD,$(DASH_SITE),$(DASH_PATCH1))
+define DASH_BUILD_CMDS
+ $(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(@D)
+endef
-dash-source: $(DL_DIR)/$(DASH_SOURCE) $(DL_DIR)/$(DASH_PATCH1)
-
-$(DASH_DIR)/.unpacked: $(DL_DIR)/$(DASH_SOURCE) $(DL_DIR)/$(DASH_PATCH1)
- $(DASH_CAT) $(DL_DIR)/$(DASH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(ZCAT) $(DL_DIR)/$(DASH_PATCH1) | patch -p1 -d $(DASH_DIR)
- touch $(DASH_DIR)/.unpacked
-
-$(DASH_DIR)/.configured: $(DASH_DIR)/.unpacked
- (cd $(DASH_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --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 \
- )
- touch $(DASH_DIR)/.configured
-
-$(DASH_DIR)/$(DASH_BINARY): $(DASH_DIR)/.configured
- $(MAKE1) CC=$(TARGET_CC) CC_FOR_BUILD="$(HOSTCC)" -C $(DASH_DIR)
- touch -c $(DASH_DIR)/$(DASH_BINARY)
-
-$(TARGET_DIR)/$(DASH_TARGET_BINARY): $(DASH_DIR)/$(DASH_BINARY)
+define DASH_INSTALL_TARGET_CMDS
cp -a $(DASH_DIR)/$(DASH_BINARY) $(TARGET_DIR)/$(DASH_TARGET_BINARY)
- touch -c $(TARGET_DIR)/$(DASH_TARGET_BINARY)
-
-dash: $(TARGET_DIR)/$(DASH_TARGET_BINARY)
+ -$(STRIPCMD) $(TARGET_DIR)/$(DASH_TARGET_BINARY)
+endef
-dash-clean:
- $(MAKE1) CC=$(TARGET_CC) -C $(DASH_DIR) clean
+define DASH_CLEAN_CMDS
+ $(MAKE1) CC=$(TARGET_CC) -C $(@@D) clean
rm -f $(TARGET_DIR)/$(DASH_TARGET_BINARY)
+endef
-dash-dirclean:
- rm -rf $(DASH_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DASH),y)
-TARGETS+=dash
-endif
+$(eval $(call AUTOTARGETS,package,dash))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 08/19] diffutils : convert to autotools infrastructure
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (6 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 07/19] dash : convert to autotools infrastructure & bump to 0.5.5.1 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 09/19] libfuse : convert to autotools infrastructure & bump to 2.8.4 cmchao
` (11 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/diffutils/diffutils.mk | 64 +++------------------------------------
1 files changed, 5 insertions(+), 59 deletions(-)
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index fd5e5a3..582929e 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -6,26 +6,11 @@
DIFFUTILS_VERSION=2.8.1
DIFFUTILS_SOURCE:=diffutils-$(DIFFUTILS_VERSION).tar.gz
DIFFUTILS_SITE:=$(BR2_GNU_MIRROR)/diffutils
-DIFFUTILS_CAT:=$(ZCAT)
-DIFFUTILS_DIR:=$(BUILD_DIR)/diffutils-$(DIFFUTILS_VERSION)
-DIFFUTILS_BINARY:=src/diff
-DIFFUTILS_TARGET_BINARY:=usr/bin/diff
-$(DL_DIR)/$(DIFFUTILS_SOURCE):
- $(call DOWNLOAD,$(DIFFUTILS_SITE),$(DIFFUTILS_SOURCE))
+DIFFUTILS_INSTALL_STAGING = YES
+DIFFUTILS_INSTALL_TARGET = YES
-diffutils-source: $(DL_DIR)/$(DIFFUTILS_SOURCE)
-
-$(DIFFUTILS_DIR)/.unpacked: $(DL_DIR)/$(DIFFUTILS_SOURCE)
- $(DIFFUTILS_CAT) $(DL_DIR)/$(DIFFUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(DIFFUTILS_DIR)/config
- touch $@
-
-$(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked
- (cd $(DIFFUTILS_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ac_cv_func_strtod=yes \
+DIFFUTILS_CONF_ENV = ac_cv_func_strtod=yes
ac_fsusage_space=yes \
fu_cv_sys_stat_statfs2_bsize=yes \
ac_cv_func_closedir_void=no \
@@ -71,45 +56,6 @@ $(DIFFUTILS_DIR)/.configured: $(DIFFUTILS_DIR)/.unpacked
gl_cv_func_mkstemp_limitations=no \
ac_cv_func_working_mktime=yes \
jm_cv_func_working_re_compile_pattern=yes \
- ac_use_included_regex=no \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- )
- touch $@
-
-$(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY): $(DIFFUTILS_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR)
-
-$(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY): $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR) \
- $(if $(BR2_STRIP_none),install,install-strip)
-ifneq ($(BR2_ENABLE_LOCALE),y)
- rm -rf $(TARGET_DIR)/usr/share/locale
-endif
-
-diffutils: $(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY)
-
-diff-utils-unpacked: $(DIFFUTILS_DIR)/.unpacked
+ ac_use_included_regex=no
-diffutils-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR) uninstall
- -$(MAKE) -C $(DIFFUTILS_DIR) clean
-
-diffutils-dirclean:
- rm -rf $(DIFFUTILS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DIFFUTILS),y)
-TARGETS+=diffutils
-endif
+$(eval $(call AUTOTARGETS,package,diffutils))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 09/19] libfuse : convert to autotools infrastructure & bump to 2.8.4
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (7 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 08/19] diffutils : convert to autotools infrastructure cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 10/19] gzip : convert to autotools infrastructure & bump to 1.4 cmchao
` (10 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/fuse/libfuse.mk | 66 ++++++++++++----------------------------------
1 files changed, 17 insertions(+), 49 deletions(-)
diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk
index b45f9ee..4c10501 100644
--- a/package/fuse/libfuse.mk
+++ b/package/fuse/libfuse.mk
@@ -3,75 +3,43 @@
# libfuse
#
#############################################################
-LIBFUSE_VERSION:=2.8.1
+LIBFUSE_VERSION:=2.8.4
LIBFUSE_SOURCE:=fuse-$(LIBFUSE_VERSION).tar.gz
LIBFUSE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/
-LIBFUSE_DIR:=$(BUILD_DIR)/fuse-$(LIBFUSE_VERSION)
-LIBFUSE_BINARY:=libfuse
-$(DL_DIR)/$(LIBFUSE_SOURCE):
- $(call DOWNLOAD,$(LIBFUSE_SITE),$(LIBFUSE_SOURCE))
-$(LIBFUSE_DIR)/.source: $(DL_DIR)/$(LIBFUSE_SOURCE)
- $(ZCAT) $(DL_DIR)/$(LIBFUSE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBFUSE_DIR) package/fuse/ \*.patch
- touch $@
-
-
-$(LIBFUSE_DIR)/.configured: $(LIBFUSE_DIR)/.source
- (cd $(LIBFUSE_DIR); rm -rf config.cache ; \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --program-prefix="" \
+LIBFUSE_INSTALL_STAGING = YES
+LIBFUSE_INSTALL_TARGET = YES
+LIBFUSE_LIBTOOL_PATCH = NO
+LIBFUSE_CONF_OPT= --program-prefix="" \
--enable-shared \
--enable-static \
--disable-nls \
--disable-example \
--disable-kernel-module \
--enable-lib \
- --enable-util \
- );
- touch $@
+ --enable-util
-$(LIBFUSE_DIR)/.compiled: $(LIBFUSE_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LIBFUSE_DIR)
- touch $@
+define LIBFUSE_INSTALL_STAGING_CMDS
+ $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR)/ install
+endef
-$(STAGING_DIR)/usr/lib/libfuse.so: $(LIBFUSE_DIR)/.compiled
- $(MAKE) -C $(LIBFUSE_DIR) DESTDIR=$(STAGING_DIR)/ install
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libfuse.so: $(STAGING_DIR)/usr/lib/libfuse.so
+define LIBFUSE_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/usr/lib
mkdir -p $(TARGET_DIR)/usr/bin
cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/fusermount
cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libfuse.so
- touch -c $@
-
-libfuse: $(TARGET_DIR)/usr/lib/libfuse.so
+endef
-libfuse-source: $(DL_DIR)/$(LIBFUSE_SOURCE)
-libfuse-clean:
- -$(MAKE) -C $(LIBFUSE_DIR) DESTDIR=$(STAGING_DIR) uninstall
- -$(MAKE) -C $(LIBFUSE_DIR) clean
+define LIBFUSE_CLEAN_CMDS
+ -$(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) uninstall
+ -$(MAKE) -C $(@D) clean
rm -f $(TARGET_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/lib/libfuse.so*
libfuse-dirclean:
- rm -rf $(LIBFUSE_DIR)
+ rm -rf $(@D)
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBFUSE),y)
-TARGETS+=libfuse
-endif
+$(eval $(call AUTOTARGETS,package,libfuse))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 10/19] gzip : convert to autotools infrastructure & bump to 1.4
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (8 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 09/19] libfuse : convert to autotools infrastructure & bump to 2.8.4 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 11/19] make : convert to autotools infrastructure cmchao
` (9 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/gzip/gzip-1.3.12-rename-futimens.patch | 48 --------------------
package/gzip/gzip.mk | 56 ++----------------------
2 files changed, 4 insertions(+), 100 deletions(-)
delete mode 100644 package/gzip/gzip-1.3.12-rename-futimens.patch
diff --git a/package/gzip/gzip-1.3.12-rename-futimens.patch b/package/gzip/gzip-1.3.12-rename-futimens.patch
deleted file mode 100644
index 8315d7c..0000000
--- a/package/gzip/gzip-1.3.12-rename-futimens.patch
+++ /dev/null
@@ -1,48 +0,0 @@
----
- gzip.c | 2 +-
- lib/utimens.c | 4 ++--
- lib/utimens.h | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: gzip-1.3.12/gzip.c
-===================================================================
---- gzip-1.3.12.orig/gzip.c
-+++ gzip-1.3.12/gzip.c
-@@ -1637,7 +1637,7 @@
- }
- }
-
-- if (futimens (ofd, ofname, timespec) != 0)
-+ if (gz_futimens (ofd, ofname, timespec) != 0)
- {
- int e = errno;
- WARN ((stderr, "%s: ", program_name));
-Index: gzip-1.3.12/lib/utimens.c
-===================================================================
---- gzip-1.3.12.orig/lib/utimens.c
-+++ gzip-1.3.12/lib/utimens.c
-@@ -75,7 +75,7 @@
- Return 0 on success, -1 (setting errno) on failure. */
-
- int
--futimens (int fd ATTRIBUTE_UNUSED,
-+gz_futimens (int fd ATTRIBUTE_UNUSED,
- char const *file, struct timespec const timespec[2])
- {
- /* Some Linux-based NFS clients are buggy, and mishandle time stamps
-@@ -185,5 +185,5 @@
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
-- return futimens (-1, file, timespec);
-+ return gz_futimens (-1, file, timespec);
- }
-Index: gzip-1.3.12/lib/utimens.h
-===================================================================
---- gzip-1.3.12.orig/lib/utimens.h
-+++ gzip-1.3.12/lib/utimens.h
-@@ -1,3 +1,3 @@
- #include <time.h>
--int futimens (int, char const *, struct timespec const [2]);
-+int gz_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index 3feb49a..8bc4c33 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -3,59 +3,11 @@
# gzip
#
#############################################################
-GZIP_VERSION:=1.3.12
+GZIP_VERSION:=1.4
GZIP_SOURCE:=gzip-$(GZIP_VERSION).tar.gz
GZIP_SITE:=$(BR2_GNU_MIRROR)/gzip
-GZIP_DIR:=$(BUILD_DIR)/gzip-$(GZIP_VERSION)
-GZIP_CAT:=$(ZCAT)
-GZIP_BINARY:=$(GZIP_DIR)/gzip
-GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore
-$(DL_DIR)/$(GZIP_SOURCE):
- $(call DOWNLOAD,$(GZIP_SITE),$(GZIP_SOURCE))
+GZIP_INSTALL_STAGING = NO
+GZIP_INSTALL_TARGET = YES
-gzip-source: $(DL_DIR)/$(GZIP_SOURCE)
-
-$(GZIP_DIR)/.unpacked: $(DL_DIR)/$(GZIP_SOURCE)
- $(GZIP_CAT) $(DL_DIR)/$(GZIP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(GZIP_DIR) package/gzip gzip\*.patch
- touch $(GZIP_DIR)/.unpacked
-
-$(GZIP_DIR)/.configured: $(GZIP_DIR)/.unpacked
- (cd $(GZIP_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/ \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- )
- touch $(GZIP_DIR)/.configured
-
-$(GZIP_BINARY): $(GZIP_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(GZIP_DIR)
-
-$(GZIP_TARGET_BINARY): $(GZIP_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) install-strip
-
-gzip: $(GZIP_TARGET_BINARY)
-
-gzip-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) uninstall
- -$(MAKE) -C $(GZIP_DIR) clean
-
-gzip-dirclean:
- rm -rf $(GZIP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_GZIP),y)
-TARGETS+=gzip
-endif
+$(eval $(call AUTOTARGETS,package,gzip))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 11/19] make : convert to autotools infrastructure
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (9 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 10/19] gzip : convert to autotools infrastructure & bump to 1.4 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 12:58 ` Paulius Zaleckas
2010-06-16 11:47 ` [Buildroot] [PATCH 12/19] quagga : convert to autotools infrastructure & bump to 0.99.12 cmchao
` (8 subsequent siblings)
19 siblings, 1 reply; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/make/make.mk | 76 ++++++-------------------------------------------
1 files changed, 10 insertions(+), 66 deletions(-)
diff --git a/package/make/make.mk b/package/make/make.mk
index 0b2657d..f09ef68 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -3,73 +3,17 @@
# make
#
#############################################################
-GNUMAKE_VERSION:=3.81
-GNUMAKE_SOURCE:=make-$(GNUMAKE_VERSION).tar.bz2
-GNUMAKE_SITE:=$(BR2_GNU_MIRROR)/make
-GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VERSION)
-GNUMAKE_CAT:=$(BZCAT)
-GNUMAKE_BINARY:=make
-GNUMAKE_TARGET_BINARY:=usr/bin/make
+MAKE_VERSION:=3.81
+MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
+MAKE_SITE:=$(BR2_GNU_MIRROR)/make
-$(DL_DIR)/$(GNUMAKE_SOURCE):
- $(call DOWNLOAD,$(GNUMAKE_SITE),$(GNUMAKE_SOURCE))
+MaOAAKE_INSTALL_STAGING = NO
+MBOAAKE_INSTALL_TARGET = YES
-make-source: $(DL_DIR)/$(GNUMAKE_SOURCE)
+MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
-$(GNUMAKE_DIR)/.unpacked: $(DL_DIR)/$(GNUMAKE_SOURCE)
- $(GNUMAKE_CAT) $(DL_DIR)/$(GNUMAKE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(GNUMAKE_DIR)/config
- touch $@
+MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
+ GLOBINC='-I$(@D)/glob' \
+ GLOBLIB=glob/libglob.a
-$(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked
- (cd $(GNUMAKE_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- make_cv_sys_gnu_glob=no \
- GLOBINC='-I$(GNUMAKE_DIR)/glob' \
- GLOBLIB=glob/libglob.a \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- $(DISABLE_LARGEFILE) \
- )
- touch $@
-
-$(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured
- $(MAKE) MAKE=$(HOSTMAKE) -C $(GNUMAKE_DIR)
-
-$(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) install
- rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
- $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-
-make: $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
-
-make-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall
- -$(MAKE) -C $(GNUMAKE_DIR) clean
-
-make-dirclean:
- rm -rf $(GNUMAKE_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MAKE),y)
-TARGETS+=make
-endif
+$(eval $(call AUTOTARGETS,package,make))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 11/19] make : convert to autotools infrastructure
2010-06-16 11:47 ` [Buildroot] [PATCH 11/19] make : convert to autotools infrastructure cmchao
@ 2010-06-16 12:58 ` Paulius Zaleckas
0 siblings, 0 replies; 24+ messages in thread
From: Paulius Zaleckas @ 2010-06-16 12:58 UTC (permalink / raw)
To: buildroot
On Wed, Jun 16, 2010 at 2:47 PM, cmchao <cmchao@gmail.com> wrote:
>
> Signed-off-by: cmchao <cmchao@gmail.com>
> ---
> ?package/make/make.mk | ? 76 ++++++-------------------------------------------
> ?1 files changed, 10 insertions(+), 66 deletions(-)
>
> diff --git a/package/make/make.mk b/package/make/make.mk
> index 0b2657d..f09ef68 100644
> --- a/package/make/make.mk
> +++ b/package/make/make.mk
> @@ -3,73 +3,17 @@
> ?# make
> ?#
> ?#############################################################
> -GNUMAKE_VERSION:=3.81
> -GNUMAKE_SOURCE:=make-$(GNUMAKE_VERSION).tar.bz2
> -GNUMAKE_SITE:=$(BR2_GNU_MIRROR)/make
> -GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VERSION)
> -GNUMAKE_CAT:=$(BZCAT)
> -GNUMAKE_BINARY:=make
> -GNUMAKE_TARGET_BINARY:=usr/bin/make
> +MAKE_VERSION:=3.81
> +MAKE_SOURCE:=make-$(MAKE_VERSION).tar.bz2
> +MAKE_SITE:=$(BR2_GNU_MIRROR)/make
>
> -$(DL_DIR)/$(GNUMAKE_SOURCE):
> - ? ? ? ?$(call DOWNLOAD,$(GNUMAKE_SITE),$(GNUMAKE_SOURCE))
> +MaOAAKE_INSTALL_STAGING = NO
> +MBOAAKE_INSTALL_TARGET = YES
What is this?
> -make-source: $(DL_DIR)/$(GNUMAKE_SOURCE)
> +MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
>
> -$(GNUMAKE_DIR)/.unpacked: $(DL_DIR)/$(GNUMAKE_SOURCE)
> - ? ? ? $(GNUMAKE_CAT) $(DL_DIR)/$(GNUMAKE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
> - ? ? ? $(CONFIG_UPDATE) $(GNUMAKE_DIR)/config
> - ? ? ? touch $@
> +MAKE_CONF_ENV = make_cv_sys_gnu_glob=no \
> + ? ? ? ? ? ? ? GLOBINC='-I$(@D)/glob' \
> + ? ? ? ? ? ? ? GLOBLIB=glob/libglob.a
>
> -$(GNUMAKE_DIR)/.configured: $(GNUMAKE_DIR)/.unpacked
> - ? ? ? (cd $(GNUMAKE_DIR); rm -rf config.cache; \
> - ? ? ? ? ? ? ? $(TARGET_CONFIGURE_OPTS) \
> - ? ? ? ? ? ? ? $(TARGET_CONFIGURE_ARGS) \
> - ? ? ? ? ? ? ? make_cv_sys_gnu_glob=no \
> - ? ? ? ? ? ? ? GLOBINC='-I$(GNUMAKE_DIR)/glob' \
> - ? ? ? ? ? ? ? GLOBLIB=glob/libglob.a \
> - ? ? ? ? ? ? ? ./configure $(QUIET) \
> - ? ? ? ? ? ? ? --target=$(GNU_TARGET_NAME) \
> - ? ? ? ? ? ? ? --host=$(GNU_TARGET_NAME) \
> - ? ? ? ? ? ? ? --build=$(GNU_HOST_NAME) \
> - ? ? ? ? ? ? ? --prefix=/usr \
> - ? ? ? ? ? ? ? --exec-prefix=/usr \
> - ? ? ? ? ? ? ? --bindir=/usr/bin \
> - ? ? ? ? ? ? ? --sbindir=/usr/sbin \
> - ? ? ? ? ? ? ? --libdir=/lib \
> - ? ? ? ? ? ? ? --libexecdir=/usr/lib \
> - ? ? ? ? ? ? ? --sysconfdir=/etc \
> - ? ? ? ? ? ? ? --datadir=/usr/share \
> - ? ? ? ? ? ? ? --localstatedir=/var \
> - ? ? ? ? ? ? ? --mandir=/usr/man \
> - ? ? ? ? ? ? ? --infodir=/usr/info \
> - ? ? ? ? ? ? ? $(DISABLE_NLS) \
> - ? ? ? ? ? ? ? $(DISABLE_LARGEFILE) \
> - ? ? ? )
> - ? ? ? touch $@
> -
> -$(GNUMAKE_DIR)/$(GNUMAKE_BINARY): $(GNUMAKE_DIR)/.configured
> - ? ? ? $(MAKE) MAKE=$(HOSTMAKE) -C $(GNUMAKE_DIR)
> -
> -$(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
> - ? ? ? $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) install
> - ? ? ? rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
> - ? ? ? ? ? ? ? $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
> -
> -make: $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
> -
> -make-clean:
> - ? ? ? $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall
> - ? ? ? -$(MAKE) -C $(GNUMAKE_DIR) clean
> -
> -make-dirclean:
> - ? ? ? rm -rf $(GNUMAKE_DIR)
> -
> -#############################################################
> -#
> -# Toplevel Makefile options
> -#
> -#############################################################
> -ifeq ($(BR2_PACKAGE_MAKE),y)
> -TARGETS+=make
> -endif
> +$(eval $(call AUTOTARGETS,package,make))
> --
> 1.7.0.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [Buildroot] [PATCH 12/19] quagga : convert to autotools infrastructure & bump to 0.99.12
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (10 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 11/19] make : convert to autotools infrastructure cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 13/19] sdl_mixer : convert to autotools infrastructure & bump to 1.2.11 cmchao
` (7 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/quagga/quagga.mk | 125 +++++++++++++---------------------------------
1 files changed, 35 insertions(+), 90 deletions(-)
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index 30ebd35..4469395 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -3,176 +3,121 @@
# quagga suite
#
#############################################################
-QUAGGA_VERSION:=0.99.9
+QUAGGA_VERSION:=0.99.12
QUAGGA_SOURCE:=quagga-$(QUAGGA_VERSION).tar.gz
QUAGGA_SITE:=http://www.quagga.net/download/attic
-QUAGGA_DIR:=$(BUILD_DIR)/quagga-$(QUAGGA_VERSION)
-QUAGGA_CAT:=$(ZCAT)
-QUAGGA_CONFIGURE:=
-QUAGGA_DEPENDENCIES:=
+QUAGGA_INSTALL_STAGING = NO
+QUAGGA_INSTALL_TARGET = YES
+QUAGGA_LIBTOOL_PATCH = NO
+QUAGGA_CONF_OPT = --program-transform-name=''
ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y)
-QUAGGA_CONFIGURE+=--enable-zebra
+QUAGGA_CONF_OPT+=--enable-zebra
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=zebra
QUAGGA_BINARY=$(QUAGGA_DIR)/zebra/.libs/zebra
endif
else
-QUAGGA_CONFIGURE+=--disable-zebra
+QUAGGA_CONF_OPT+=--disable-zebra
endif
ifeq ($(BR2_PACKAGE_QUAGGA_BGPD),y)
-QUAGGA_CONFIGURE+=--enable-bgpd
+QUAGGA_CONF_OPT+=--enable-bgpd
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=bgpd
QUAGGA_BINARY=$(QUAGGA_DIR)/bgpd/.libs/bgpd
endif
else
-QUAGGA_CONFIGURE+=--disable-bgpd
+QUAGGA_CONF_OPT+=--disable-bgpd
endif
ifeq ($(BR2_PACKAGE_QUAGGA_RIPD),y)
-QUAGGA_CONFIGURE+=--enable-ripd
+QUAGGA_CONF_OPT+=--enable-ripd
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=ripd
QUAGGA_BINARY=$(QUAGGA_DIR)/ripd/.libs/ripd
endif
else
-QUAGGA_CONFIGURE+=--disable-ripd
+QUAGGA_CONF_OPT+=--disable-ripd
endif
ifeq ($(BR2_PACKAGE_QUAGGA_RIPNGD),y)
-QUAGGA_CONFIGURE+=--enable-ripngd
+QUAGGA_CONF_OPT+=--enable-ripngd
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=ripngd
QUAGGA_BINARY=$(QUAGGA_DIR)/ripngd/.libs/ripngd
endif
else
-QUAGGA_CONFIGURE+=--disable-ripngd
+QUAGGA_CONF_OPT+=--disable-ripngd
endif
ifeq ($(BR2_PACKAGE_QUAGGA_OSPFD),y)
-QUAGGA_CONFIGURE+=--enable-ospfd
+QUAGGA_CONF_OPT+=--enable-ospfd
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=ospfd
QUAGGA_BINARY=$(QUAGGA_DIR)/ospfd/.libs/ospfd
endif
else
-QUAGGA_CONFIGURE+=--disable-ospfd
+QUAGGA_CONF_OPT+=--disable-ospfd
endif
ifeq ($(BR2_PACKAGE_QUAGGA_OSPF6D),y)
-QUAGGA_CONFIGURE+=--enable-ospf6d
+QUAGGA_CONF_OPT+=--enable-ospf6d
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=ospf6d
QUAGGA_BINARY=$(QUAGGA_DIR)/ospf6d/.libs/ospf6d
endif
else
-QUAGGA_CONFIGURE+=--disable-ospf6d
+QUAGGA_CONF_OPT+=--disable-ospf6d
endif
ifeq ($(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),y)
-QUAGGA_CONFIGURE+=--enable-watchquagga
+QUAGGA_CONF_OPT+=--enable-watchquagga
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=watchquagga
QUAGGA_BINARY=$(QUAGGA_DIR)/watchquagga/.libs/watchquagga
endif
else
-QUAGGA_CONFIGURE+=--disable-watchquagga
+QUAGGA_CONF_OPT+=--disable-watchquagga
endif
ifeq ($(BR2_PACKAGE_QUAGGA_ISISD),y)
-QUAGGA_CONFIGURE+=--enable-isisd
+QUAGGA_CONF_OPT+=--enable-isisd
ifndef QUAGGA_TARGET_BINARY
QUAGGA_TARGET_BINARY=isisd
QUAGGA_BINARY=$(QUAGGA_DIR)/isisd/.libs/isisd
endif
else
-QUAGGA_CONFIGURE+=--disable-isisd
+QUAGGA_CONF_OPT+=--disable-isisd
endif
ifeq ($(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),y)
-QUAGGA_CONFIGURE+=--enable-bgp-announce
+QUAGGA_CONF_OPT+=--enable-bgp-announce
else
-QUAGGA_CONFIGURE+=--disable-bgp-announce
+QUAGGA_CONF_OPT+=--disable-bgp-announce
endif
ifeq ($(BR2_PACKAGE_QUAGGA_NETLINK),y)
-QUAGGA_CONFIGURE+=--enable-netlink
+QUAGGA_CONF_OPT+=--enable-netlink
else
-QUAGGA_CONFIGURE+=--disable-netlink
+QUAGGA_CONF_OPT+=--disable-netlink
endif
ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
-QUAGGA_CONFIGURE+=--enable-snmp
+QUAGGA_CONF_OPT+=--enable-snmp
QUAGGA_DEPENDENCIES+=netsnmp
else
-QUAGGA_CONFIGURE+=--disable-snmp
+QUAGGA_CONF_OPT+=--disable-snmp
endif
ifeq ($(BR2_PACKAGE_QUAGGA_TCP_ZEBRA),y)
-QUAGGA_CONFIGURE+=--enable-tcp-zebra
+QUAGGA_CONF_OPT+=--enable-tcp-zebra
else
-QUAGGA_CONFIGURE+=--disable-tcp-zebra
+QUAGGA_CONF_OPT+=--disable-tcp-zebra
endif
ifeq ($(BR2_PACKAGE_QUAGGA_OPAGUE_LSA),y)
-QUAGGA_CONFIGURE+=--enable-opaque-lsa
+QUAGGA_CONF_OPT+=--enable-opaque-lsa
else
-QUAGGA_CONFIGURE+=--disable-opaque-lsa
+QUAGGA_CONF_OPT+=--disable-opaque-lsa
endif
-$(DL_DIR)/$(QUAGGA_SOURCE):
- $(call DOWNLOAD,$(QUAGGA_SITE),$(QUAGGA_SOURCE))
-
-ifneq ($(QUAGGA_PATCH),)
-QUAGGA_PATCH_FILE=$(DL_DIR)/$(QUAGGA_PATCH)
-$(DL_DIR)/$(QUAGGA_PATCH):
- $(call DOWNLOAD,$(QUAGGA_SITE),$(QUAGGA_PATCH))
-endif
-quagga-source: $(DL_DIR)/$(QUAGGA_SOURCE) $(QUAGGA_PATCH_FILE)
-
-$(QUAGGA_DIR)/.unpacked: $(DL_DIR)/$(QUAGGA_SOURCE) $(DL_DIR)/$(QUAGGA_PATCH)
- $(QUAGGA_CAT) $(DL_DIR)/$(QUAGGA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(QUAGGA_DIR) package/quagga/ quagga\*.patch
-ifneq ($(QUAGGA_PATCH),)
- (cd $(QUAGGA_DIR) && $(QUAGGA_CAT) $(DL_DIR)/$(QUAGGA_PATCH) | patch -p1)
- if [ -d $(QUAGGA_DIR)/debian/patches ]; then \
- toolchain/patch-kernel.sh $(QUAGGA_DIR) $(QUAGGA_DIR)/debian/patches \*.patch; \
- fi
-endif
- touch $@
-
-$(QUAGGA_DIR)/.configured: $(QUAGGA_DIR)/.unpacked
- (cd $(QUAGGA_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- $(DISABLE_LARGEFILE) \
- $(DISABLE_IPV6) \
- $(QUAGGA_CONFIGURE) \
- --program-transform-name='' \
- )
- touch $@
-
-$(QUAGGA_BINARY): $(QUAGGA_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(QUAGGA_DIR)
-
-$(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY): $(QUAGGA_BINARY)
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(QUAGGA_DIR) install
+define BOA_INSTALL_TARGET_CMDS
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
ifneq ($(BR2_PACKAGE_QUAGGA_HEADERS),y)
rm -rf $(TARGET_DIR)/usr/include/quagga
endif
+endef
-quagga: $(QUAGGA_DEPENDENCIES) $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY)
-
-quagga-clean:
- -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(QUAGGA_DIR) uninstall
- -$(MAKE) -C $(QUAGGA_DIR) clean
-
-quagga-dirclean:
- rm -rf $(QUAGGA_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_QUAGGA),y)
-TARGETS+=quagga
-endif
+$(eval $(call AUTOTARGETS,package,quagga))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 13/19] sdl_mixer : convert to autotools infrastructure & bump to 1.2.11
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (11 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 12/19] quagga : convert to autotools infrastructure & bump to 0.99.12 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 14/19] sdl_ttf : convert to autotools infrastructure cmchao
` (6 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/sdl_mixer/sdl_mixer.mk | 67 ++++++++--------------------------------
1 files changed, 13 insertions(+), 54 deletions(-)
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index a097734..1c72264 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -3,66 +3,25 @@
# SDL_mixer
#
#############################################################
-SDL_MIXER_VERSION:=1.2.8
+SDL_MIXER_VERSION:=1.2.11
SDL_MIXER_SOURCE:=SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
SDL_MIXER_SITE:=http://www.libsdl.org/projects/SDL_mixer/release/
-SDL_MIXER_CAT:=$(ZCAT)
-SDL_MIXER_DIR:=$(BUILD_DIR)/SDL_mixer-$(SDL_MIXER_VERSION)
-$(DL_DIR)/$(SDL_MIXER_SOURCE):
- $(call DOWNLOAD,$(SDL_MIXER_SITE),$(SDL_MIXER_SOURCE))
+SDL_MIXER_LIBTOOL_PATCH = NO
+SDL_MIXER_INSTALL_STAGING = YES
+SDL_MIXER_INSTALL_TARGET = YES
+SDL_MIXER_DEPENDENCIES = sdl
+SDL_MIXER_CONF_OPT = --without-x --with-sdl-prefix=$(STAGING_DIR)/usr
-sdl_mixer-source: $(DL_DIR)/$(SDL_MIXER_SOURCE)
-
-$(SDL_MIXER_DIR)/.unpacked: $(DL_DIR)/$(SDL_MIXER_SOURCE)
- $(SDL_MIXER_CAT) $(DL_DIR)/$(SDL_MIXER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(SDL_MIXER_DIR)/build-scripts
- touch $@
-
-$(SDL_MIXER_DIR)/.configured: $(SDL_MIXER_DIR)/.unpacked $(STAGING_DIR)/usr/lib/libSDL.so
- (cd $(SDL_MIXER_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --without-x \
- --with-freetype-prefix=$(STAGING_DIR)/usr \
- --with-sdl-prefix=$(STAGING_DIR)/usr \
- )
- touch $@
-
-$(SDL_MIXER_DIR)/.compiled: $(SDL_MIXER_DIR)/.configured
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(SDL_MIXER_DIR)
- touch $@
-
-$(STAGING_DIR)/usr/lib/libSDL_mixer.so: $(SDL_MIXER_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_MIXER_DIR) install
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libSDL_mixer.so: $(STAGING_DIR)/usr/lib/libSDL_mixer.so
+define SDL_MIXER_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libSDL_mixer*.so* $(TARGET_DIR)/usr/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_mixer*.so*
+endef
-sdl_mixer: sdl $(TARGET_DIR)/usr/lib/libSDL_mixer.so
-
-sdl_mixer-clean:
+define SDL_MIXER_CLEAN_CMDS
rm -f $(TARGET_DIR)/usr/lib/libSDL_mixer*.so*
- -$(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_MIXER_DIR) uninstall
- -$(MAKE) -C $(SDL_MIXER_DIR) clean
+ -$(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) uninstall
+ -$(MAKE) -C $(@D) clean
+endef
-sdl_mixer-dirclean:
- rm -rf $(SDL_MIXER_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SDL_MIXER),y)
-TARGETS+=sdl_mixer
-endif
+$(eval $(call AUTOTARGETS,package,sdl_mixer))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 14/19] sdl_ttf : convert to autotools infrastructure
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (12 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 13/19] sdl_mixer : convert to autotools infrastructure & bump to 1.2.11 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 15/19] sdl : convert to autotools infrastructure & bump to 1.2.14 cmchao
` (5 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/sdl_ttf/sdl_ttf.mk | 76 +++++---------------------------------------
1 files changed, 8 insertions(+), 68 deletions(-)
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index 21bfc5e..fdec497 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -6,74 +6,14 @@
SDL_TTF_VERSION:=2.0.9
SDL_TTF_SOURCE:=SDL_ttf-$(SDL_TTF_VERSION).tar.gz
SDL_TTF_SITE:=http://www.libsdl.org/projects/SDL_ttf/release/
-SDL_TTF_CAT:=$(ZCAT)
-SDL_TTF_DIR:=$(BUILD_DIR)/SDL_ttf-$(SDL_TTF_VERSION)
-$(DL_DIR)/$(SDL_TTF_SOURCE):
- $(call DOWNLOAD,$(SDL_TTF_SITE),$(SDL_TTF_SOURCE))
-
-sdl_ttf-source: $(DL_DIR)/$(SDL_TTF_SOURCE)
-
-$(SDL_TTF_DIR)/.unpacked: $(DL_DIR)/$(SDL_TTF_SOURCE)
- $(SDL_TTF_CAT) $(DL_DIR)/$(SDL_TTF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(CONFIG_UPDATE) $(SDL_TTF_DIR)
- touch $@
-
-$(SDL_TTF_DIR)/.configured: $(SDL_TTF_DIR)/.unpacked
- (cd $(SDL_TTF_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/lib \
- --sysconfdir=/etc \
- --datadir=/share \
- --localstatedir=/var \
- --includedir=/include \
- --mandir=/man \
- --infodir=/info \
- --without-x \
+SDL_TTF_LIBTOOL_PATCH = NO
+SDL_TTF_INSTALL_STAGING = YES
+SDL_TTF_INSTALL_TARGET = YES
+SDL_TTF_DEPENDENCIES = sdl freetype
+SDL_TTF_CONF_OPT = --without-x \
--with-freetype-prefix=$(STAGING_DIR)/usr \
- --with-sdl-prefix=$(STAGING_DIR)/usr \
- )
- touch $@
-
-$(SDL_TTF_DIR)/.compiled: $(SDL_TTF_DIR)/.configured
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
- INCLUDES="-I$(STAGING_DIR)/usr/include/SDL -I$(STAGING_DIR)/usr/include/freetype2" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
- DESTDIR=$(STAGING_DIR)/usr -C $(SDL_TTF_DIR)
- touch $@
-
-$(STAGING_DIR)/usr/lib/libSDL_ttf.so: $(SDL_TTF_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_TTF_DIR) install
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libSDL_ttf.so: $(STAGING_DIR)/usr/lib/libSDL_ttf.so
- cp -dpf $(STAGING_DIR)/usr/lib/libSDL_ttf*.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL_ttf.so
-
-sdl_ttf: sdl freetype $(TARGET_DIR)/usr/lib/libSDL_ttf.so
+ --with-sdl-prefix=$(STAGING_DIR)/usr
-sdl_ttf-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_TTF_DIR) uninstall
- -$(MAKE) -C $(SDL_TTF_DIR) clean
-
-sdl_ttf-dirclean:
- rm -rf $(SDL_TTF_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SDL_TTF),y)
-TARGETS+=sdl_ttf
-endif
+SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib"
+$(eval $(call AUTOTARGETS,package,sdl_ttf))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 15/19] sdl : convert to autotools infrastructure & bump to 1.2.14
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (13 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 14/19] sdl_ttf : convert to autotools infrastructure cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 16/19] gmp : convert to autotools infrastructure & bump to 5.0.1 cmchao
` (4 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/sdl/sdl.mk | 105 +++++++++++-----------------------------------------
1 files changed, 22 insertions(+), 83 deletions(-)
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 959be7e..facff42 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -3,122 +3,61 @@
# SDL
#
#############################################################
-SDL_VERSION:=1.2.13
+SDL_VERSION:=1.2.14
SDL_SOURCE:=SDL-$(SDL_VERSION).tar.gz
SDL_SITE:=http://www.libsdl.org/release
-SDL_CAT:=$(ZCAT)
-SDL_DIR:=$(BUILD_DIR)/SDL-$(SDL_VERSION)
+
+SDL_LIBTOOL_PATCH = NO
+SDL_INSTALL_STAGING = YES
+SDL_INSTALL_TARGET = YES
SDL_EXTRA_CFLAGS = -I./include -D_GNU_SOURCE=1 -fvisibility=hidden -D_REENTRANT -D_REENTRANT -DHAVE_LINUX_VERSION_H
ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
-SDL_FBCON=--enable-video-fbcon=yes
+SDL_CONF_OPT+=--enable-video-fbcon=yes
else
-SDL_FBCON=--enable-video-fbcon=no
+SDL_CONF_OPT+=--enable-video-fbcon=no
endif
ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
SDL_DEPENDENCIES += directfb
-SDL_DIRECTFB=--enable-video-directfb=yes
-SDL_DIRECTFB_TARGET:=$(STAGING_DIR)/include/directfb
-SDL_DIRECTFB_INCLUDES:=-I$(STAGING_DIR)/usr/include/directfb
-SDL_EXTRA_CFLAGS += $(SDL_DIRECTFB_INCLUDES)
+SDL_CONF_OPT+=--enable-video-directfb=yes
+SDL_CONF_ENV+= $(SDL_DIRECTFB_INCLUDES)
else
SDL_DIRECTFB=--enable-video-directfb=no
endif
ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
-SDL_QTOPIA=--enable-video-qtopia=yes
+SDL_CONF_OPT+=--enable-video-qtopia=yes
SDL_DEPENDENCIES += qt
else
-SDL_QTOPIA=--enable-video-qtopia=no
+SDL_CONF_OPT+=--enable-video-qtopia=no
endif
ifeq ($(BR2_PACKAGE_SDL_X11),y)
-SDL_X11=--enable-video-x11=yes
+SDL_CONF_OPT+=--enable-video-x11=yes
SDL_DEPENDENCIES += xserver_xorg-server
else
-SDL_X11=--enable-video-x11=no
+SDL_CONF_OPT+=--enable-video-x11=no
endif
ifeq ($(BR2_PACKAGE_TSLIB),y)
SDL_DEPENDENCIES += tslib
endif
-$(DL_DIR)/$(SDL_SOURCE):
- $(call DOWNLOAD,$(SDL_SITE),$(SDL_SOURCE))
-
-sdl-source: $(DL_DIR)/$(SDL_SOURCE)
-
-$(SDL_DIR)/.unpacked: $(DL_DIR)/$(SDL_SOURCE)
- $(SDL_CAT) $(DL_DIR)/$(SDL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SDL_DIR) package/sdl sdl-$(SDL_VERSION)\*.patch
- $(CONFIG_UPDATE) $(SDL_DIR)
- $(CONFIG_UPDATE) $(SDL_DIR)/build-scripts
- touch $@
-
-$(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
- (cd $(SDL_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=$(STAGING_DIR)/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-pulseaudio=no \
+SDL_CONF_OPT += --enable-pulseaudio=no \
--disable-arts \
--disable-esd \
- --disable-nasm \
- $(SDL_FBCON) \
- $(SDL_DIRECTFB) \
- $(SDL_QTOPIA) \
- $(SDL_X11) \
- )
- touch $@
+ --disable-nasm
-ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
-$(SDL_DIRECTFB_TARGET):
- mkdir -p $(STAGING_DIR)/include
- ln -s -f ../usr/include/directfb $(SDL_DIRECTFB_TARGET)
-endif
-
-$(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
- EXTRA_CFLAGS="$(SDL_EXTRA_CFLAGS)" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
- DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR)
- touch $@
+define SDL_POST_INSTALL_STAGING_HOOKS
+ $(SED) 's^libdir=\$${exec_prefix}^libdir=/usr^' \
+ $(STAGING_DIR)/usr/bin/sdl-config
+endef
-$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) -C $(SDL_DIR) install
-# use correct rpath for linking
- $(SED) 's^libdir=\$${exec_prefix}^libdir=/usr^' \
- $(STAGING_DIR)/usr/bin/sdl-config
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libSDL.so: $(STAGING_DIR)/usr/lib/libSDL.so
+define SDL_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libSDL*.so* $(TARGET_DIR)/usr/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libSDL.so
+endef
-SDL sdl: $(SDL_DEPENDENCIES) $(TARGET_DIR)/usr/lib/libSDL.so
-
-sdl-unpacked: $(SDL_DIR)/.unpacked
-
-sdl-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_DIR) uninstall
- -$(MAKE) -C $(SDL_DIR) clean
-
-sdl-dirclean:
- rm -rf $(SDL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_SDL),y)
-TARGETS+=sdl
-endif
+$(eval $(call AUTOTARGETS,package,sdl))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 16/19] gmp : convert to autotools infrastructure & bump to 5.0.1
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (14 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 15/19] sdl : convert to autotools infrastructure & bump to 1.2.14 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 17/19] libgpg-error : convert to autotools infrastructure & bump to 1.8 cmchao
` (3 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/gmp/gmp.mk | 111 ++++------------------------------------------------
1 files changed, 8 insertions(+), 103 deletions(-)
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index a3488b8..b850ad1 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -3,108 +3,13 @@
# gmp
#
#############################################################
-GMP_VERSION:=4.2.4
-GMP_SOURCE:=gmp-$(GMP_VERSION).tar.bz2
-GMP_SITE:=$(BR2_GNU_MIRROR)/gmp
-GMP_CAT:=$(BZCAT)
-GMP_DIR:=$(TOOLCHAIN_DIR)/gmp-$(GMP_VERSION)
-GMP_TARGET_DIR:=$(BUILD_DIR)/gmp-$(GMP_VERSION)
-GMP_BINARY:=libgmp$(LIBTGTEXT)
-GMP_HOST_BINARY:=libgmp$(HOST_LIBEXT)
-GMP_LIBVERSION:=3.4.4
+LIBGMP_VERSION:=5.0.1
+LIBGMP_SOURCE:=gmp-$(LIBGMP_VERSION).tar.bz2
+LIBGMP_SITE:=$(BR2_GNU_MIRROR)/gmp
-# this is a workaround for a bug in GMP, please see
-# http://gmplib.org/list-archives/gmp-devel/2006-April/000618.html
-ifeq ($(HOST_EXEEXT),.exe)
-GMP_CPP_FLAGS:=CPPFLAGS=-DDLL_EXPORT
-endif
+LIBGMP_LIBTOOL_PATCH = NO
+LIBGMP_INSTALL_STAGING = YES
+LIBGMP_INSTALL_TARGET = YES
-$(DL_DIR)/$(GMP_SOURCE):
- $(call DOWNLOAD,$(GMP_SITE),$(GMP_SOURCE))
-
-libgmp-source: $(DL_DIR)/$(GMP_SOURCE)
-
-$(GMP_DIR)/.unpacked: $(DL_DIR)/$(GMP_SOURCE)
- $(GMP_CAT) $(DL_DIR)/$(GMP_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(GMP_DIR) package/gmp/ \*.patch
- $(CONFIG_UPDATE) $(@D)
- touch $@
-
-$(GMP_TARGET_DIR)/.configured: $(GMP_DIR)/.unpacked
- mkdir -p $(GMP_TARGET_DIR)
- (cd $(GMP_TARGET_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- $(GMP_CPP_FLAGS) \
- $(GMP_DIR)/configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- $(PREFERRED_LIB_FLAGS) \
- $(DISABLE_NLS) \
- )
- touch $@
-
-$(GMP_TARGET_DIR)/.libs/$(GMP_BINARY): $(GMP_TARGET_DIR)/.configured
- #$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(GMP_TARGET_DIR)
- $(MAKE) -C $(GMP_TARGET_DIR)
-
-$(STAGING_DIR)/usr/lib/$(GMP_BINARY): $(GMP_TARGET_DIR)/.libs/$(GMP_BINARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(GMP_TARGET_DIR) install
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(STAGING_DIR)/usr/lib/libgmp$(LIBTGTEXT)*
-
-$(TARGET_DIR)/usr/lib/libgmp.so $(TARGET_DIR)/usr/lib/libgmp.so.$(GMP_LIBVERSION) $(TARGET_DIR)/usr/lib/libgmp.a: $(STAGING_DIR)/usr/lib/$(GMP_BINARY)
- cp -dpf $(STAGING_DIR)/usr/lib/libgmp$(LIBTGTEXT)* $(TARGET_DIR)/usr/lib/
-ifeq ($(BR2_PACKAGE_LIBGMP_HEADERS),y)
- test -d $(TARGET_DIR)/usr/include || mkdir -p $(TARGET_DIR)/usr/include
- cp -dpf $(STAGING_DIR)/usr/include/gmp.h $(TARGET_DIR)/usr/include/
-endif
-
-libgmp: $(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT)
-stage-libgmp: $(STAGING_DIR)/usr/lib/$(GMP_BINARY)
-
-libgmp-clean:
- rm -f $(TARGET_DIR)/usr/lib/libgmp.* $(TARGET_DIR)/usr/include/gmp.h \
- $(STAGING_DIR)/usr/lib/libgmp* $(STAGING_DIR)/usr/include/gmp.h
- -$(MAKE) -C $(GMP_TARGET_DIR) clean
-
-libgmp-dirclean:
- rm -rf $(GMP_TARGET_DIR) $(GMP_DIR)
-
-GMP_DIR2:=$(TOOLCHAIN_DIR)/gmp-$(GMP_VERSION)-host
-GMP_HOST_DIR:=$(TOOLCHAIN_DIR)/gmp
-$(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked
- mkdir -p $(GMP_DIR2)
- (cd $(GMP_DIR2); rm -rf config.cache; \
- $(HOST_CONFIGURE_OPTS) \
- $(GMP_CPP_FLAGS) \
- $(GMP_DIR)/configure $(QUIET) \
- --prefix="$(GMP_HOST_DIR)" \
- --build=$(GNU_HOST_NAME) \
- --host=$(GNU_HOST_NAME) \
- --disable-shared \
- --enable-static \
- $(DISABLE_NLS) \
- )
- touch $@
-
-$(GMP_HOST_DIR)/lib/libgmp$(HOST_LIBEXT): $(GMP_DIR2)/.configured
- $(MAKE) -C $(GMP_DIR2) install
-
-host-libgmp: $(GMP_HOST_DIR)/lib/$(GMP_HOST_BINARY)
-host-libgmp-source: libgmp-source
-host-libgmp-clean:
- rm -rf $(GMP_HOST_DIR)
- -$(MAKE) -C $(GMP_DIR2) clean
-host-libgmp-dirclean:
- rm -rf $(GMP_HOST_DIR) $(GMP_DIR2)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBGMP),y)
-TARGETS+=libgmp
-endif
+$(eval $(call AUTOTARGETS,package,libgmp))
+$(eval $(call AUTOTARGETS,package,libgmp,host))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 17/19] libgpg-error : convert to autotools infrastructure & bump to 1.8
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (15 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 16/19] gmp : convert to autotools infrastructure & bump to 5.0.1 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 18/19] liblockfile : convert to autotools infrastructure & bump to 1.08-4 cmchao
` (2 subsequent siblings)
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/libgpg-error/libgpg-error.mk | 72 ++-------------------------------
1 files changed, 5 insertions(+), 67 deletions(-)
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 0b513ff..06a31c2 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -3,74 +3,12 @@
# libgpg-error
#
#############################################################
-LIBGPG_ERROR_VERSION:=1.5
+LIBGPG_ERROR_VERSION:=1.8
LIBGPG_ERROR_SOURCE:=libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
LIBGPG_ERROR_SITE:=ftp://gd.tuwien.ac.at/privacy/gnupg/libgpg-error
-LIBGPG_ERROR_DIR:=$(BUILD_DIR)/libgpg-error-$(LIBGPG_ERROR_VERSION)
-LIBGPG_ERROR_LIBRARY:=src/libgpg-error.la
-LIBGPG_ERROR_DESTDIR:=usr/lib
-LIBGPG_ERROR_TARGET_LIBRARY=$(LIBGPG_ERROR_DESTDIR)/libgpg-error.so
-$(DL_DIR)/$(LIBGPG_ERROR_SOURCE):
- $(call DOWNLOAD,$(LIBGPG_ERROR_SITE),$(LIBGPG_ERROR_SOURCE))
+LIBGPG_ERROR_LIBTOOL_PATCH = NO
+LIBGPG_ERROR_INSTALL_STAGING = YES
+LIBGPG_ERROR_INSTALL_TARGET = YES
-$(LIBGPG_ERROR_DIR)/.source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE)
- $(BZCAT) $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBGPG_ERROR_DIR) package/libgpg-error/ libgpg-error\*.patch
- $(CONFIG_UPDATE) $(LIBGPG_ERROR_DIR)
- touch $(LIBGPG_ERROR_DIR)/.source
-
-$(LIBGPG_ERROR_DIR)/.configured: $(LIBGPG_ERROR_DIR)/.source
- (cd $(LIBGPG_ERROR_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/usr/lib \
- --libexecdir=/$(LIBGPG_ERROR_DESTDIR) \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --includedir=/usr/include \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- )
- touch $(LIBGPG_ERROR_DIR)/.configured
-
-$(LIBGPG_ERROR_DIR)/$(LIBGPG_ERROR_LIBRARY): $(LIBGPG_ERROR_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LIBGPG_ERROR_DIR)
-
-$(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY): $(LIBGPG_ERROR_DIR)/$(LIBGPG_ERROR_LIBRARY)
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGPG_ERROR_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libgpg-error.la
-
-$(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY)
- cp -dpf $<* $(TARGET_DIR)/$(LIBGPG_ERROR_DESTDIR)
-
-libgpg-error: $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY)
-
-libgpg-error-source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE)
-
-libgpg-error-clean:
- rm -f $(TARGET_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY)*
- -$(MAKE) -C $(LIBGPG_ERROR_DIR) clean
- rm -f $(STAGING_DIR)/$(LIBGPG_ERROR_TARGET_LIBRARY)\*
-
-libgpg-error-dirclean:
- rm -rf $(LIBGPG_ERROR_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBGPG_ERROR),y)
-TARGETS+=libgpg-error
-endif
+$(eval $(call AUTOTARGETS,package,libgpg_error))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 18/19] liblockfile : convert to autotools infrastructure & bump to 1.08-4
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (16 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 17/19] libgpg-error : convert to autotools infrastructure & bump to 1.8 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 11:47 ` [Buildroot] [PATCH 19/19] lrzsz : convert to autotools infrastructure cmchao
2010-06-20 15:02 ` [Buildroot] [PATCH 00/19] Convert packages to new autotools Thomas Petazzoni
19 siblings, 0 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/liblockfile/liblockfile.mk | 65 ++++++++----------------------------
1 files changed, 14 insertions(+), 51 deletions(-)
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index b30d356..6684e86 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -6,66 +6,29 @@
LIBLOCKFILE_VERSION=1.08
LIBLOCKFILE_SOURCE:=liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
LIBLOCKFILE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/libl/liblockfile/
-LIBLOCKFILE_CAT:=$(ZCAT)
-LIBLOCKFILE_DIR:=$(BUILD_DIR)/liblockfile-$(LIBLOCKFILE_VERSION)
-LIBLOCKFILE_BINARY:=usr/lib/liblockfile.so.1.0
+LIBLOCKFILE_PATCH:=liblockfile_$(LIBLOCKFILE_VERSION)-4.debian.tar.bz2
-$(DL_DIR)/$(LIBLOCKFILE_SOURCE):
- $(call DOWNLOAD,$(LIBLOCKFILE_SITE),$(LIBLOCKFILE_SOURCE))
+LIBLOCKFILE_INSTALL_STAGING = YES
+LIBLOCKFILE_INSTALL_TARGET = YES
+LIBLOCKFILE_CONF_OPT = --enable-shared --mandir=/usr/share/man
-liblockfile-source: $(DL_DIR)/$(LIBLOCKFILE_SOURCE)
-
-$(LIBLOCKFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBLOCKFILE_SOURCE)
- $(LIBLOCKFILE_CAT) $(DL_DIR)/$(LIBLOCKFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(LIBLOCKFILE_DIR) package/liblockfile/ \*.patch
- touch $@
-
-$(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked
- (cd $(LIBLOCKFILE_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --bindir=/usr/bin \
- --libdir=/usr/lib \
- --includedir=/usr/include \
- --mandir=/usr/share/man \
- --enable-shared \
- )
- touch $@
-
-$(STAGING_DIR)/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured
+define LIBLOCKFILE_INSTALL_STAGING_CMDS
mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3)
rm -f $(STAGING_DIR)/usr/lib/liblockfile.so
$(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install
ln -sf liblockfile.so $(STAGING_DIR)/usr/lib/liblockfile.so.1
- touch -c $@
+endef
-$(TARGET_DIR)/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/$(LIBLOCKFILE_BINARY)
- mkdir -p $(@D)
- cp -a $(STAGING_DIR)/usr/lib/liblockfile.so* $(@D)
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
- touch -c $@
+define LIBLOCKFILE_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/liblockfile.so* $(TARGET_DIR)/usr/lib
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/liblockfile.so*
+endef
-liblockfile: $(TARGET_DIR)/$(LIBLOCKFILE_BINARY)
-
-liblockfile-clean:
+define LIBLOCKFILE_CLEAN_CMDS
rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
rm -f $(STAGING_DIR)/usr/lib/liblockfile*
rm -f $(addprefix $(STAGING_DIR)/usr/include/,lockfile.h mailfile.h)
- -$(MAKE) -C $(LIBLOCKFILE_DIR) clean
-
-liblockfile-dirclean:
- rm -rf $(LIBLOCKFILE_DIR)
+ -$(MAKE) -C $(@D) clean
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LIBLOCKFILE),y)
-TARGETS+=liblockfile
-endif
+$(eval $(call AUTOTARGETS,package,liblockfile))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 19/19] lrzsz : convert to autotools infrastructure
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (17 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 18/19] liblockfile : convert to autotools infrastructure & bump to 1.08-4 cmchao
@ 2010-06-16 11:47 ` cmchao
2010-06-16 17:13 ` Thomas Petazzoni
2010-06-16 20:43 ` Peter Korsgaard
2010-06-20 15:02 ` [Buildroot] [PATCH 00/19] Convert packages to new autotools Thomas Petazzoni
19 siblings, 2 replies; 24+ messages in thread
From: cmchao @ 2010-06-16 11:47 UTC (permalink / raw)
To: buildroot
Signed-off-by: cmchao <cmchao@gmail.com>
---
package/lrzsz/lrzsz.mk | 71 +++++++++++------------------------------------
1 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index 0a7de51..0b7f4e6 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -23,64 +23,27 @@
LRZSZ_VERSION:=0.12.20
LRZSZ_SITE:=http://www.ohse.de/uwe/releases
LRZSZ_SOURCE:=lrzsz-$(LRZSZ_VERSION).tar.gz
-LRZSZ_DIR:=$(BUILD_DIR)/lrzsz-$(LRZSZ_VERSION)
-$(DL_DIR)/$(LRZSZ_SOURCE):
- $(call DOWNLOAD,$(LRZSZ_SITE),$(LRZSZ_SOURCE))
+LRZSR_CONF_OPT = --disable-timesync
-lrzsz-source: $(DL_DIR)/$(LRZSZ_SOURCE)
+define LRZSZ_POST_CONFIGURE_HOOKS
+ $(SED) "s/-lnsl//;" $(@D)/src/Makefile
+ $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h
+endef
-$(LRZSZ_DIR)/.unpacked: $(DL_DIR)/$(LRZSZ_SOURCE)
- $(ZCAT) $(DL_DIR)/$(LRZSZ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(LRZSZ_DIR)/.unpacked
+define LRZSZ_BUILD_HOOKS
+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D)
+ $(STRIPCMD) $(@D)/src/lrz $(@D)/src/lsz
+endef
-$(LRZSZ_DIR)/.configured: $(LRZSZ_DIR)/.unpacked
- (cd $(LRZSZ_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/tmp \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- --disable-timesync \
- )
- $(SED) "s/-lnsl//;" $(LRZSZ_DIR)/src/Makefile
- $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(LRZSZ_DIR)/config.h
- touch $(LRZSZ_DIR)/.configured
+define LRZSZ_INSTALL_TARGET_CMDS
+ cp $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz
+ cp $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz
+endef
-$(LRZSZ_DIR)/src/lrz: $(LRZSZ_DIR)/.configured
- $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(LRZSZ_DIR)
- $(STRIPCMD) $(LRZSZ_DIR)/src/lrz $(LRZSZ_DIR)/src/lsz
-
-$(TARGET_DIR)/usr/bin/rz: $(LRZSZ_DIR)/src/lrz
- cp $(LRZSZ_DIR)/src/lrz $(TARGET_DIR)/usr/bin/rz
- cp $(LRZSZ_DIR)/src/lsz $(TARGET_DIR)/usr/bin/sz
-
-lrzsz: $(TARGET_DIR)/usr/bin/rz
-
-lrzsz-clean:
+define LRZSZ_CLEAN_CMDS
rm -f $(TARGET_DIR)/usr/bin/rz
- -$(MAKE) -C $(LRZSZ_DIR) clean
+ -$(MAKE) -C $(@D) clean
+endef
-lrzsz-dirclean:
- rm -rf $(LRZSZ_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LRZSZ),y)
-TARGETS+=lrzsz
-endif
+$(eval $(call AUTOTARGETS,package,lrzsz))
--
1.7.0.4
^ permalink raw reply related [flat|nested] 24+ messages in thread* [Buildroot] [PATCH 00/19] Convert packages to new autotools
2010-06-16 11:47 [Buildroot] [PATCH 00/19] Convert packages to new autotools cmchao
` (18 preceding siblings ...)
2010-06-16 11:47 ` [Buildroot] [PATCH 19/19] lrzsz : convert to autotools infrastructure cmchao
@ 2010-06-20 15:02 ` Thomas Petazzoni
19 siblings, 0 replies; 24+ messages in thread
From: Thomas Petazzoni @ 2010-06-20 15:02 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 16 Jun 2010 19:47:02 +0800
cmchao <cmchao@gmail.com> wrote:
> The work convert 19 autotool-based packages to new infrastructure and some of them
> are upgraded to new version
Thanks! I've picked up all patches, except the lrzsz one which has
already been merged in mainline by Peter, and I've integrated those
patches into my autotools-conversion branch at
http://git.buildroot.net/~tpetazzoni/git/buildroot/log/
I've already done a bunch of small improvements to your patches and
I'll test them now. Once they'll be ready, I'll push them to Peter.
Thanks for doing this work!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 24+ messages in thread