Commit a2a22b82 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'autotools-conversion' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 6074f08b 6b929693

package/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ source "package/leafpad/Config.in" 
source "package/midori/Config.in"

source "package/pcmanfm/Config.in"

source "package/rdesktop/Config.in"

source "package/rxvt/Config.in"

source "package/sylpheed/Config.in"

source "package/synergy/Config.in"

source "package/torsmo/Config.in"

source "package/x11vnc/Config.in"

source "package/xstroke/Config.in"

source "package/xterm/Config.in"

source "package/xvkbd/Config.in"

endmenu

package/berkeleydb/berkeleydb.mk

+25 −57
Original line number Diff line number Diff line
@@ -3,25 +3,17 @@ 
# 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



$(DL_DIR)/$(DB_SOURCE):

	$(call DOWNLOAD,$(DB_SITE),$(DB_SOURCE))



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; \

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

BERKELEYDB_SUBDIR=build_unix

BERKELEYDB_INSTALL_STAGING = YES



#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 +40,24 @@ $(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 $@



$(DB_DIR)/build_unix/.libs/$(DB_SHARLIB): $(DB_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix



$(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)

	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DB_DIR)/build_unix install

	chmod a-x $(STAGING_DIR)/lib/libdb*so*

	rm -f $(STAGING_DIR)/bin/db_*

	rm -rf $(STAGING_DIR)/share/locale

	$(SED) 's/\.lo/.o/g' $(@D)/build_unix/Makefile

endef



$(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)

	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)

	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdb*so*



$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a

ifeq ($(BR2_HAVE_DEVFILES),y)

define BERKELEYDB_INSTALL_TARGET_DEVFILES_CMDS

	cp -dpf $(STAGING_DIR)/usr/include/db.h $(TARGET_DIR)/usr/include/

	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

endif



berkeleydb: $(TARGET_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/$(BERKELEYDB_SHARLIB) libdb.so)

	$(BERKELEYDB_INSTALL_TARGET_DEVFILES_CMDS)

endef



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_BERKELEYDB),y)

TARGETS+=berkeleydb

endif
 
$(eval $(call AUTOTARGETS,package,berkeleydb))

package/dash/dash.mk

+10 −63
Original line number Diff line number Diff line
@@ -3,71 +3,18 @@ 
# 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_BINARY:=src/dash

DASH_TARGET_BINARY:=bin/dash

DASH_PATCH:=dash_$(DASH_VERSION)-6.diff.gz



$(DL_DIR)/$(DASH_SOURCE):

	$(call DOWNLOAD,$(DASH_SITE),$(DASH_SOURCE))

define DASH_INSTALL_TARGET_CMDS

	cp -a $(@D)/src/dash $(TARGET_DIR)/bin/dash

endef



$(DL_DIR)/$(DASH_PATCH1):

	$(call DOWNLOAD,$(DASH_SITE),$(DASH_PATCH1))

define DASH_CLEAN_CMDS

	$(MAKE) -C $(@D) clean

	rm -f $(TARGET_DIR)/bin/dash

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)

	cp -a $(DASH_DIR)/$(DASH_BINARY) $(TARGET_DIR)/$(DASH_TARGET_BINARY)

	touch -c $(TARGET_DIR)/$(DASH_TARGET_BINARY)



dash: $(TARGET_DIR)/$(DASH_TARGET_BINARY)



dash-clean:

	$(MAKE1) CC=$(TARGET_CC) -C $(DASH_DIR) clean

	rm -f $(TARGET_DIR)/$(DASH_TARGET_BINARY)



dash-dirclean:

	rm -rf $(DASH_DIR)



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(BR2_PACKAGE_DASH),y)

TARGETS+=dash

endif
 
$(eval $(call AUTOTARGETS,package,dash))

package/dialog/dialog.mk

+10 −50
Original line number Diff line number Diff line
@@ -3,59 +3,19 @@ 
# 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_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

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))

package/diffutils/diffutils.mk

+4 −59
Original line number Diff line number Diff line
@@ -6,26 +6,10 @@ 
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-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 +55,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))