Commit c76e2a97 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- add a SVN_UP command for updating an already checked-out tree

parent 7b0ad787
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -672,10 +672,14 @@ config BR2_WGET
	string "Wget command"
	default "wget --passive-ftp -nd"

config BR2_SVN
config BR2_SVN_CO
	string "Subversion (svn) command to download source tree"
	default "svn co"

config BR2_SVN_UP
	string "Subversion (svn) command to update source tree"
	default "svn up"

config BR2_GIT
	string "Git command to download source tree"
	default "git clone"
+5 −9
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2

$(DL_DIR)/$(TREMOR_SOURCE):
	(cd $(BUILD_DIR); \
		svn co $(TREMOR_TRUNK); \
		$(SVN_CO) $(TREMOR_TRUNK); \
		mv -f Tremor $(TREMOR_NAME); \
		tar -cvf $(TREMOR_NAME).tar $(TREMOR_DIR); \
		bzip2 $(TREMOR_NAME).tar; \
		rm -fr $(TREMOR_DIR); \
		rm -rf $(TREMOR_DIR); \
		mv $(TREMOR_NAME).tar.bz2 $(DL_DIR)/$(TREMOR_SOURCE); \
	)

@@ -99,9 +99,6 @@ $(TREMOR_DIR)/.configured: $(TREMOR_DIR)/.source
		$(TARGET_CONFIGURE_ARGS) \
		$(TARGET_CONFIGURE_OPTS) \
		CFLAGS="$(TARGET_CFLAGS)" \
		PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
		PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
		./configure \
		--target=$(GNU_TARGET_NAME) \
		--host=$(GNU_TARGET_NAME) \
@@ -150,11 +147,10 @@ tremor-dirclean:
#
############################################################
ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS)),y)
ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS)),y)
ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS_TREMOR)),y)
TARGETS+=tremor
else
TARGETS+=libvorbis
endif
TARGETS+=libvorbis
endif

ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS_HEADERS)),y)