standardize handling of GNU configure scripts (ef7784a6) · Commits · Dom Sekotill / buildroot

Makefile

+8 −7

Original line number	Diff line number	Diff line
		@@ -55,14 +55,14 @@ BUILD_WITH_LARGEFILE:=true
		WGET:=wget --passive-ftp

		# Optimize toolchain for which type of CPU?
		#OPTIMIZE_FOR_CPU:=i486
		#OPTIMIZE_FOR_CPU:=strongarm
		#OPTIMIZE_FOR_CPU:=whatever
		OPTIMIZE_FOR_CPU:=$(ARCH)
		OPTIMIZE_FOR_CPU=$(ARCH)
		#OPTIMIZE_FOR_CPU=i486
		#OPTIMIZE_FOR_CPU=strongarm
		#OPTIMIZE_FOR_CPU=whatever

		# Any additional gcc options you may want to include....
		#EXTRA_GCC_CONFIG_OPTIONS:=--without-float
		EXTRA_GCC_CONFIG_OPTIONS:=
		EXTRA_GCC_CONFIG_OPTIONS=
		#EXTRA_GCC_CONFIG_OPTIONS=--without-float

		#############################################################
		#
		@@ -135,7 +135,8 @@ TARGET_PATH:=$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:/bin:/sbin:/usr/bin:/usr/
		STRIP:=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
		#STRIP:=/bin/true
		IMAGE:=$(BASE_DIR)/root_fs
		GNU_TARGET_NAME:=$(OPTIMIZE_FOR_CPU)-pc-linux-gnu
		MAKE:=make
		GNU_TARGET_NAME:=$(OPTIMIZE_FOR_CPU)-unknown-linux-gnu
		ifneq ($(strip $(ARCH)),i386)
		CROSS:=$(ARCH)-linux-
		endif

make/autoconf.mk

+13 −4

Original line number	Diff line number	Diff line
		@@ -20,11 +20,20 @@ $(AUTOCONF_DIR)/.unpacked: $(DL_DIR)/$(AUTOCONF_SOURCE)
		touch $(AUTOCONF_DIR)/.unpacked

		$(AUTOCONF_DIR)/.configured: $(AUTOCONF_DIR)/.unpacked
		(cd $(AUTOCONF_DIR); rm -f config.cache; CC=$(TARGET_CC1) \
		CFLAGS=-D_POSIX_SOURCE EMACS="no" ./configure \
		--target=i386-uclibc \
		(cd $(AUTOCONF_DIR); rm -rf config.cache; PATH=$(STAGING_DIR)/bin:$$PATH \
		CC=$(TARGET_CC1) EMACS="no" \
		./configure \
		--target=$(GNU_TARGET_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 $(AUTOCONF_DIR)/.configured

		@@ -53,7 +62,7 @@ autoconf: uclibc $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY)

		autoconf-clean:
		$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(AUTOCONF_DIR) uninstall
		-make -C $(AUTOCONF_DIR) clean
		-$(MAKE) -C $(AUTOCONF_DIR) clean

		autoconf-dirclean:
		rm -rf $(AUTOCONF_DIR)

make/automake.mk

+13 −4

Original line number	Diff line number	Diff line
		@@ -20,11 +20,20 @@ $(AUTOMAKE_DIR)/.unpacked: $(DL_DIR)/$(AUTOMAKE_SOURCE)
		touch $(AUTOMAKE_DIR)/.unpacked

		$(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_DIR)/.unpacked
		(cd $(AUTOMAKE_DIR); rm -f config.cache; CC=$(TARGET_CC1) \
		CFLAGS=-D_POSIX_SOURCE ./configure \
		--target=i386-uclibc \
		(cd $(AUTOMAKE_DIR); rm -rf config.cache; \
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
		./configure \
		--target=$(GNU_TARGET_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 $(AUTOMAKE_DIR)/.configured

		@@ -55,7 +64,7 @@ automake: uclibc $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY)

		automake-clean:
		$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(AUTOMAKE_DIR) uninstall
		-make -C $(AUTOMAKE_DIR) clean
		-$(MAKE) -C $(AUTOMAKE_DIR) clean

		automake-dirclean:
		rm -rf $(AUTOMAKE_DIR)

make/bash.mk

+18 −5

Original line number	Diff line number	Diff line
		@@ -20,10 +20,23 @@ $(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
		touch $(BASH_DIR)/.unpacked

		$(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
		(cd $(BASH_DIR); autoconf; rm -f config.cache; CC=$(TARGET_CC1) \
		CFLAGS=-D_POSIX_SOURCE ./configure --prefix=/usr --disable-nls \
		--mandir=/junk --infodir=/junk \
		--with-curses --enable-alias \
		(cd $(BASH_DIR); rm -rf config.cache; \
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
		./configure \
		--target=$(GNU_TARGET_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 \
		--disable-nls \
		--with-curses \
		--enable-alias \
		);
		touch $(BASH_DIR)/.configured

		@@ -40,7 +53,7 @@ bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)

		bash-clean:
		$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC1) -C $(BASH_DIR) uninstall
		-make -C $(BASH_DIR) clean
		-$(MAKE) -C $(BASH_DIR) clean

		bash-dirclean:
		rm -rf $(BASH_DIR)

make/berkeleydb.mk

+23 −15

Original line number	Diff line number	Diff line
		@@ -17,23 +17,31 @@ $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
		zcat $(DL_DIR)/$(DB_SOURCE) \| tar -C $(BUILD_DIR) -xvf -
		touch $(DB_DIR)/.dist

		$(DB_DIR)/build_unix/Makefile: $(DB_DIR)/.dist
		(cd $(DB_DIR)/build_unix; PATH="$(TARGET_PATH)" \
		CC=$(TARGET_CC1) ../dist/configure \
		$(DB_DIR)/.configured: $(DB_DIR)/.dist
		(cd $(DB_DIR)/build_unix; rm -rf config.cache; \
		PATH=$(STAGING_DIR)/bin:$$PATH CC=$(TARGET_CC1) \
		../dist/configure \
		--target=$(GNU_TARGET_NAME) \
		--prefix=/usr \
		--localstatedir=/var \
		--exec-prefix=/usr \
		--bindir=/usr/bin \
		--sbindir=/usr/sbin \
		--libexecdir=/usr/lib \
		--sysconfdir=/etc \
		--libexecdir=/usr/sbin \
		--mandir=/usr/share/man \
		--enable-shared=yes \
		)
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--enable-shared \
		);
		touch $(DB_DIR)/.configured

		$(DB_DIR)/build_unix/.libs/libdb-4.0.so: $(DB_DIR)/build_unix/Makefile
		PATH="$(TARGET_PATH)" make -C $(DB_DIR)/build_unix
		$(DB_DIR)/build_unix/.libs/libdb-4.0.so: $(DB_DIR)/.configured
		$(MAKE) CC=$(TARGET_CC1) -C $(DB_DIR)/build_unix

		$(STAGING_DIR)/lib/libdb-4.0.so: $(DB_DIR)/build_unix/.libs/libdb-4.0.so
		-mkdir -p $(STAGING_DIR)/man/man1
		PATH="$(TARGET_PATH)" make -C $(DB_DIR)/build_unix prefix=$(STAGING_DIR) install
		$(MAKE) DESTDIR=$(STAGING_DIR) CC=$(TARGET_CC1) -C $(DB_DIR)/build_unix install
		rm -rf $(STAGING_DIR)/man/man1

		$(TARGET_DIR)/lib/libdb-4.0.so: $(STAGING_DIR)/lib/libdb-4.0.so
		@@ -43,7 +51,7 @@ $(TARGET_DIR)/lib/libdb-4.0.so: $(STAGING_DIR)/lib/libdb-4.0.so
		-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib//libdbso

		db-clean:
		make -C $(DB_DIR)/build_unix clean
		$(MAKE) -C $(DB_DIR)/build_unix clean

		db-dirclean:
		rm -rf $(DB_DIR)