Browse Source

Don't hardcode the gcc tarball name (Closes: #916412)

Jonathan McDowell 4 months ago
parent
commit
57b4535464
2 changed files with 11 additions and 3 deletions
  1. 8
    1
      debian/changelog
  2. 3
    2
      debian/rules

+ 8
- 1
debian/changelog View File

@@ -1,3 +1,10 @@
1
+ghdl (0.35+git20181129+dfsg-3) UNRELEASED; urgency=medium
2
+
3
+  [ Matthias Klose ]
4
+  * Don't hardcode the gcc tarball name (Closes: #916412)
5
+
6
+ -- Jonathan McDowell <noodles@earth.li>  Fri, 14 Dec 2018 08:29:24 +0000
7
+
1 8
 ghdl (0.35+git20181129+dfsg-2) unstable; urgency=medium
2 9
 
3 10
   * Update debian/copyright to cover additional source files
@@ -234,7 +241,7 @@ ghdl (0.16-1) unstable; urgency=low
234 241
   * No longer need fix_cf_files.sh (fixed upstream)
235 242
   * Standards version bumped to 3.6.1.1
236 243
   * Added lintian override to let me say "VHDL" in description synopsys
237
-	
244
+
238 245
  -- Wesley J. Landaker <wjl@icecavern.net>  Fri, 21 Jan 2005 11:45:01 -0700
239 246
 
240 247
 ghdl (0.14-2) unstable; urgency=low

+ 3
- 2
debian/rules View File

@@ -15,7 +15,7 @@ export PKG_VERSION := $(DEB_VENDOR) $(DEB_VERSION)
15 15
 # These variables are used to find and unpack the gcc source
16 16
 GCC_DIR := /usr/src/gcc-8
17 17
 GCC_VER := 8
18
-VER_GCC := 8.2.0-dfsg
18
+GCC_TARBALL := $(notdir $(wildcard $(GCC_DIR)/gcc-*.tar.*))
19 19
 
20 20
 # Get parallel option to parallelize the gcc build specifically (Ada builds
21 21
 # are already parallelized by code included from debian_packaging-*.mk above).
@@ -77,9 +77,10 @@ override_dh_auto_configure:
77 77
 	@echo Configuring with gcc backend
78 78
 	@echo ------------------------------------------------------------
79 79
 	# gcc unpack sequence cribbed from gcc-7-cross debian/rules
80
+	set -e; \
80 81
 	if [ -n "$(WITH_GCC)" ]; then \
81 82
 		cd $(BUILDDIR)/gcc; \
82
-		ln -sf ${GCC_DIR}/gcc-${VER_GCC}.tar.xz gcc-${VER_GCC}.tar.xz; \
83
+		ln -sf ${GCC_DIR}/$(GCC_TARBALL) $(GCC_TARBALL); \
83 84
 		cp -a  ${GCC_DIR}/debian/ .; \
84 85
 		if [ -n "$$(grep -v '^\#' ${CURDIR}/debian/patches/gcc-${GCC_VER}/series)" ]; then \
85 86
 			QUILT_PATCHES=${CURDIR}/debian/patches/gcc-${GCC_VER} quilt push --quiltrc /dev/null -a; \