Commit c5da6f95 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

toolchain/gdb: strip tarball component when extracting 



For some tarballs of gdb (see next patch), the extracted directory is
*not* named after the version string (eg. gdb-6.6a extract into gdb-6.6/)

Create the appropriate directory first, then use --strip-{components,path}
when extracting gdb (the same way it is done for the generic package
infrastructure).

At the same time, get rid of the snapshot special case, because:
 1- it's no longer available in the menu
 2- it would be handled by the above change

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 37f0d1bb

toolchain/gdb/gdb.mk

+2 −7
Original line number Diff line number Diff line
@@ -28,13 +28,8 @@ $(DL_DIR)/$(GDB_SOURCE): 


gdb-unpacked: $(GDB_DIR)/.unpacked

$(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)

	mkdir -p $(TOOLCHAIN_DIR)

	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -

ifeq ($(GDB_VERSION),snapshot)

	GDB_REAL_DIR=$(shell \

		tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1)

	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)

endif

	mkdir -p $(GDB_DIR)

	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -

ifneq ($(wildcard $(GDB_PATCH_DIR)),)

	support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)

endif