- cleanup and fixes (Cristian Ionescu-Idbohrn) (e4c6340a) · Commits · Dom Sekotill / buildroot

package/asterisk/asterisk.mk

+36 −13

Original line number	Diff line number	Diff line
		@@ -16,27 +16,50 @@ $(DL_DIR)/$(ASTERISK_SOURCE):
		$(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE)
		$(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk\*.patch
		touch $(ASTERISK_DIR)/.source
		touch $@

		$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.source
		touch $(ASTERISK_DIR)/.configured
		touch $@

		$(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured
		$(MAKE1) -C $(ASTERISK_DIR) CROSS_ARCH=Linux CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE_BIN=$(STAGING_DIR)/bin/ CROSS_COMPILE_TARGET=$(STAGING_DIR) CROSS_PROC=$(OPTIMIZE_FOR_CPU) OPTIMIZE="$(TARGET_OPTIMIZATION)" OPTIONS=-DLOW_MEMORY DEBUG= $(TARGET_CONFIGURE_OPTS)
		$(MAKE1) -C $(ASTERISK_DIR) \
		CROSS_ARCH=Linux \
		CROSS_COMPILE=$(TARGET_CROSS) \
		CROSS_COMPILE_BIN=$(STAGING_DIR)/bin/ \
		CROSS_COMPILE_TARGET=$(STAGING_DIR) \
		CROSS_PROC=$(OPTIMIZE_FOR_CPU) \
		OPTIMIZE="$(TARGET_OPTIMIZATION)" \
		OPTIONS=-DLOW_MEMORY \
		DEBUG= \
		$(TARGET_CONFIGURE_OPTS)

		$(TARGET_DIR)/$(ASTERISK_TARGET_BINARY): $(ASTERISK_DIR)/$(ASTERISK_BINARY)
		$(MAKE) -C $(ASTERISK_DIR) CROSS_ARCH=Linux CROSS_COMPILE=$(TARGET_CROSS) CROSS_COMPILE_BIN=$(TARGET_CC) CROSS_COMPILE_TARGET=$(STAGING_DIR) CROSS_PROC=$(OPTIMIZE_FOR_CPU) OPTIMIZE="$(TARGET_OPTIMIZATION)" OPTIONS=-DLOW_MEMORY DEBUG= $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) install
		$(MAKE) -C $(ASTERISK_DIR) \
		CROSS_ARCH=Linux \
		CROSS_COMPILE=$(TARGET_CROSS) \
		CROSS_COMPILE_BIN=$(TARGET_CC) \
		CROSS_COMPILE_TARGET=$(STAGING_DIR) \
		CROSS_PROC=$(OPTIMIZE_FOR_CPU) \
		OPTIMIZE="$(TARGET_OPTIMIZATION)" \
		OPTIONS=-DLOW_MEMORY \
		DEBUG= \
		$(TARGET_CONFIGURE_OPTS) \
		DESTDIR=$(TARGET_DIR) install
		$(STRIP) $(TARGET_DIR)/usr/sbin/asterisk
		$(STRIP) $(TARGET_DIR)/usr/sbin/stereorize
		$(STRIP) $(TARGET_DIR)/usr/sbin/streamplayer
		$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/asterisk/modules/*.so
		$(INSTALL) -m 755 $(ASTERISK_DIR)/contrib/init.d/rc.debian.asterisk $(TARGET_DIR)/etc/init.d/S60asterisk
		$(STRIP) $(STRIP_STRIP_UNNEEDED) \
		$(TARGET_DIR)/usr/lib/asterisk/modules/*.so
		$(INSTALL) -m 755 $(ASTERISK_DIR)/contrib/init.d/rc.debian.asterisk \
		$(TARGET_DIR)/etc/init.d/S60asterisk
		mv $(TARGET_DIR)/usr/include/asterisk $(STAGING_DIR)/usr/include/
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -Rf $(TARGET_DIR)/usr/share/man
		endif
		rm -f $(TARGET_DIR)/usr/sbin/safe_asterisk
		rm -f $(TARGET_DIR)/usr/sbin/autosupport
		rm -f $(TARGET_DIR)/usr/sbin/astgenkey
		touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
		touch -c $@

		asterisk: uclibc ncurses zlib openssl mpg123 $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)

package/autoconf/autoconf.mk

+13 −7

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ $(AUTOCONF_DIR)/.configured: $(AUTOCONF_SRC_DIR)/.unpacked
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		)
		touch $@

		@@ -70,12 +70,18 @@ $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY): $(AUTOCONF_DIR)/bin/$(AUTOCONF_BINARY)
		sysconfdir=$(TARGET_DIR)/etc \
		localstatedir=$(TARGET_DIR)/var \
		libdir=$(TARGET_DIR)/usr/lib \
		infodir=$(TARGET_DIR)/usr/info \
		mandir=$(TARGET_DIR)/usr/man \
		infodir=$(TARGET_DIR)/usr/share/info \
		mandir=$(TARGET_DIR)/usr/share/man \
		includedir=$(TARGET_DIR)/usr/include \
		-C $(AUTOCONF_DIR) install
		rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/info
		endif
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/man
		endif
		rm -rf $(TARGET_DIR)/share/locale
		rm -rf $(TARGET_DIR)/usr/share/doc
		touch -c $@

		autoconf: uclibc $(TARGET_DIR)/$(AUTOCONF_TARGET_BINARY)

package/automake/automake.mk

+13 −6

Original line number	Diff line number	Diff line
		@@ -53,8 +53,9 @@ $(AUTOMAKE_DIR)/.configured: $(AUTOMAKE_SRC_DIR)/.unpacked
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--includedir=/usr/include \
		)
		touch $@

		@@ -73,12 +74,18 @@ $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY): $(AUTOMAKE_DIR)/$(AUTOMAKE_BINARY)
		sysconfdir=$(TARGET_DIR)/etc \
		localstatedir=$(TARGET_DIR)/var \
		libdir=$(TARGET_DIR)/usr/lib \
		infodir=$(TARGET_DIR)/usr/info \
		mandir=$(TARGET_DIR)/usr/man \
		infodir=$(TARGET_DIR)/usr/share/info \
		mandir=$(TARGET_DIR)/usr/share/man \
		includedir=$(TARGET_DIR)/usr/include \
		-C $(AUTOMAKE_DIR) install
		rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/info
		endif
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/man
		endif
		rm -rf $(TARGET_DIR)/share/locale
		rm -rf $(TARGET_DIR)/usr/share/doc
		touch -c $@

		automake: uclibc autoconf $(TARGET_DIR)/$(AUTOMAKE_TARGET_BINARY)

package/bash/bash.mk

+16 −6

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ $(DL_DIR)/$(BASH_SOURCE):
		bash-source: $(DL_DIR)/$(BASH_SOURCE)

		bash-unpacked: $(BASH_DIR)/.unpacked

		$(BASH_DIR)/.unpacked: $(DL_DIR)/$(BASH_SOURCE)
		$(BASH_CAT) $(DL_DIR)/$(BASH_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		toolchain/patch-kernel.sh $(BASH_DIR) package/bash/ bash??-\*
		@@ -48,8 +49,9 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
		--sysconfdir=/etc \
		--datadir=/usr/share \
		--localstatedir=/var \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--includedir=/usr/include \
		$(DISABLE_NLS) \
		$(DISABLE_LARGEFILE) \
		--with-curses \
		@@ -67,17 +69,25 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
		rm -f $(TARGET_DIR)/bin/bash*
		mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
		(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
		rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/info
		endif
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(TARGET_DIR)/usr/share/man
		endif
		rm -rf $(TARGET_DIR)/share/locale
		rm -rf $(TARGET_DIR)/usr/share/doc

		# If both bash and busybox are selected, make certain bash wins
		#the fight over who gets to own the /bin/sh symlink
		# the fight over who gets to own the /bin/sh symlink.
		ifeq ($(BR2_PACKAGE_BUSYBOX),y)
		bash: ncurses uclibc busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY)
		else
		bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
		endif

		# If both bash and busybox are selected, the /bin/sh symlink
		# may need to be reinstated by the clean targets.
		bash-clean:
		-$(MAKE1) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BASH_DIR) uninstall
		rm -f $(TARGET_DIR)/$(BASH_TARGET_BINARY)

package/berkeleydb/berkeleydb.mk

+14 −8

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ 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)/.dist
		touch $@

		$(DB_DIR)/.configured: $(DB_DIR)/.dist
		(cd $(DB_DIR)/build_unix; rm -rf config.cache; \
		@@ -37,8 +37,8 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
		--datadir=/usr/share \
		--localstatedir=/var \
		--includedir=/usr/include \
		--mandir=/usr/man \
		--infodir=/usr/info \
		--mandir=/usr/share/man \
		--infodir=/usr/share/info \
		--with-gnu-ld \
		--enable-shared \
		--disable-cxx \
		@@ -50,7 +50,7 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist
		$(DISABLE_LARGEFILE) \
		)
		$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile
		touch $(DB_DIR)/.configured
		touch $@

		$(DB_DIR)/build_unix/.libs/$(DB_SHARLIB): $(DB_DIR)/.configured
		$(MAKE) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix
		@@ -59,13 +59,19 @@ $(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/libdbso
		rm -f $(STAGING_DIR)/bin/db_*
		rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/info \
		$(STAGING_DIR)/man $(STAGING_DIR)/share/doc
		ifneq ($(BR2_HAVE_INFOPAGES),y)
		rm -rf $(STAGING_DIR)/usr/share/info
		endif
		ifneq ($(BR2_HAVE_MANPAGES),y)
		rm -rf $(STAGING_DIR)/usr/share/man
		endif
		rm -rf $(STAGING_DIR)/share/locale
		rm -rf $(STAGING_DIR)/usr/share/doc

		$(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
		rm -rf $(TARGET_DIR)/lib/libdb*
		cp -a $(STAGING_DIR)/lib/libdbso $(TARGET_DIR)/lib/
		rm -f $(TARGET_DIR)/lib/libdb.so $(TARGET_DIR)/lib/libdb.la $(TARGET_DIR)/lib/libdb.a
		rm -f $(addprefix $(TARGET_DIR)/lib/,libdb.so libdb.la libdb.a)
		(cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so)
		-$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libdbso

		@@ -73,7 +79,7 @@ $(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-$(DB_SO_VERSION).a
		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 $(TARGET_DIR)/usr/lib/libdb.a
		touch -c $@

		berkeleydb-headers: $(TARGET_DIR)/usr/lib/libdb.a