Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit 1a9ed319 authored by Andreas Bombe's avatar Andreas Bombe

Adapt patches to new upstream version

Gbp-Dch: Ignore
parent 905e8eac
......@@ -5,9 +5,9 @@ Last-Update: 2018-01-12
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in 2018-01-12 04:29:54.738021054 +0100
+++ git/Makefile.in 2018-01-12 04:49:19.838108857 +0100
@@ -396,10 +396,10 @@
--- git.orig/Makefile.in 2018-05-13 03:59:31.407271758 +0200
+++ git/Makefile.in 2018-05-13 03:59:31.403271763 +0200
@@ -406,10 +406,10 @@
vpi_thunk.o: $(GRTSRCDIR)/vpi_thunk.c $(GRTSRCDIR)/vpi_thunk.h
# Do not use OPT_FLAGS (do not enable coverage)
......
......@@ -7,9 +7,9 @@ Last-Update: 2018-01-12
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in 2017-11-14 02:14:21.561068894 +0100
+++ git/Makefile.in 2017-11-14 02:14:21.561068894 +0100
@@ -40,7 +40,7 @@
--- git.orig/Makefile.in 2018-05-12 04:14:00.086001402 +0200
+++ git/Makefile.in 2018-05-12 04:14:00.082001422 +0200
@@ -44,7 +44,7 @@
INSTALL_PROGRAM=install -m 755
INSTALL_DATA=install -m 644
......
......@@ -7,12 +7,12 @@ Last-Update: 2018-01-12
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: git/libraries/Makefile.inc
===================================================================
--- git.orig/libraries/Makefile.inc 2017-11-23 04:50:02.594145591 +0100
+++ git/libraries/Makefile.inc 2017-12-06 22:59:13.797756145 +0100
@@ -359,3 +359,21 @@
libs.vhdl.standard: $(LIB93_DIR)/std/std_standard.o \
$(LIB87_DIR)/std/std_standard.o \
$(LIB08_DIR)/std/std_standard.o
--- git.orig/libraries/Makefile.inc 2018-05-12 23:33:48.340773255 +0200
+++ git/libraries/Makefile.inc 2018-05-12 23:33:48.336773258 +0200
@@ -356,3 +356,21 @@
libs.vhdl.standard: $(STD93_DIR)/std_standard.o \
$(STD87_DIR)/std_standard.o \
$(STD08_DIR)/std_standard.o
+
+
+##############################################################################
......
......@@ -5,9 +5,9 @@ Last-Update: 2018-01-12
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in 2017-12-30 00:39:11.457192393 +0100
+++ git/Makefile.in 2018-01-07 19:33:23.016082333 +0100
@@ -25,6 +25,7 @@
--- git.orig/Makefile.in 2018-05-13 03:56:53.723460399 +0200
+++ git/Makefile.in 2018-05-13 03:56:53.719460403 +0200
@@ -26,6 +26,7 @@
backend=@backend@
libdirsuffix=@libdirsuffix@
libdirreverse=@libdirreverse@
......@@ -15,7 +15,7 @@ Index: git/Makefile.in
EXEEXT=@EXEEXT@
SOEXT=@SOEXT@
PIC_FLAGS=@PIC_FLAGS@
@@ -43,8 +44,8 @@
@@ -47,8 +48,8 @@
PWD=$(CURDIR)
DESTDIR=
bindir=$(prefix)/bin
......@@ -26,7 +26,7 @@ Index: git/Makefile.in
MKDIR=mkdir
LN=ln -s
CP=cp
@@ -174,7 +175,7 @@
@@ -179,7 +180,7 @@
$(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL=$(PWD)/ghdl_mcode$(EXEEXT) GHDL_FLAGS="" VHDL_COPY_OBJS=no vhdl.libs.all
install.mcode.program: install.dirs ghdl_mcode$(EXEEXT)
......@@ -35,7 +35,7 @@ Index: git/Makefile.in
install.mcode: install.mcode.program install.vhdllib install.vpi
@@ -312,8 +313,8 @@
@@ -317,8 +318,8 @@
LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
......@@ -48,9 +48,9 @@ Index: git/Makefile.in
Index: git/configure
===================================================================
--- git.orig/configure 2017-12-30 00:39:11.457192393 +0100
+++ git/configure 2018-01-07 19:33:36.144069750 +0100
@@ -11,6 +11,7 @@
--- git.orig/configure 2018-05-13 03:56:53.723460399 +0200
+++ git/configure 2018-05-13 03:58:07.059372574 +0200
@@ -19,6 +19,7 @@
LDFLAGS=
prefix=/usr/local
libdirsuffix=lib/ghdl
......@@ -58,16 +58,16 @@ Index: git/configure
libdirreverse=../..
gcc_src_dir=
llvm_config=
@@ -28,7 +29,7 @@
@@ -37,7 +38,7 @@
show_help=no
progname=$0
-subst_vars="CC CXX GNATMAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee"
+subst_vars="CC CXX GNATMAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse incdirsuffix gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee"
-subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version"
+subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse incdirsuffix gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version"
# Find srcdir
srcdir=`dirname $progname`
@@ -67,6 +68,8 @@
@@ -76,6 +77,8 @@
;;
--prefix=*) prefix="$optarg";;
--srcdir=*) srcdir="$optarg";;
......@@ -76,7 +76,7 @@ Index: git/configure
--with-gcc=*) gcc_src_dir="$optarg"; backend=gcc;;
--with-llvm=*) echo "--with-llvm is deprecated, use --with-llvm-config";
llvm_config="$optarg/bin/llvm-config"; backend=llvm;;
@@ -95,6 +98,8 @@
@@ -106,6 +109,8 @@
Options [defaults in brackets]:
--prefix=PREFIX install in PREFIX [$prefix]
--srcdir=SRCDIR source code path [$srcdir]
......@@ -85,7 +85,7 @@ Index: git/configure
--with-gcc=DIR use gcc backend from DIR
--with-llvm-config=PATH use llvm from PATH (needs llvm 3.5 - 3.9)
--with-backtrace-lib=LIB.a link with libbacktrace LIB.a to display a
@@ -329,10 +334,11 @@
@@ -350,10 +355,11 @@
sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \
-e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \
-e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \
......@@ -100,8 +100,8 @@ Index: git/configure
< $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
Index: git/src/ghdldrv/default_paths.ads.in
===================================================================
--- git.orig/src/ghdldrv/default_paths.ads.in 2017-12-30 00:39:11.457192393 +0100
+++ git/src/ghdldrv/default_paths.ads.in 2017-12-30 00:39:11.453192398 +0100
--- git.orig/src/ghdldrv/default_paths.ads.in 2018-05-13 03:56:53.723460399 +0200
+++ git/src/ghdldrv/default_paths.ads.in 2018-05-13 03:56:53.719460403 +0200
@@ -25,6 +25,8 @@
"@INSTALL_PREFIX@";
Lib_Prefix : constant String :=
......@@ -113,8 +113,8 @@ Index: git/src/ghdldrv/default_paths.ads.in
"@COMPILER_GCC@";
Index: git/src/ghdldrv/ghdlvpi.adb
===================================================================
--- git.orig/src/ghdldrv/ghdlvpi.adb 2017-12-30 00:39:11.457192393 +0100
+++ git/src/ghdldrv/ghdlvpi.adb 2017-12-30 00:39:11.453192398 +0100
--- git.orig/src/ghdldrv/ghdlvpi.adb 2018-05-13 03:56:53.723460399 +0200
+++ git/src/ghdldrv/ghdlvpi.adb 2018-05-13 03:56:53.719460403 +0200
@@ -38,7 +38,7 @@
-- Compute install path
Ghdllocal.Set_Exec_Prefix;
......@@ -135,8 +135,8 @@ Index: git/src/ghdldrv/ghdlvpi.adb
-- Return the lib directory, but unixify the path (for a unix shell in
Index: git/dist/gcc/Make-lang.in
===================================================================
--- git.orig/dist/gcc/Make-lang.in 2017-12-29 20:15:20.945298884 +0100
+++ git/dist/gcc/Make-lang.in 2017-12-30 19:00:57.273784135 +0100
--- git.orig/dist/gcc/Make-lang.in 2018-05-13 03:56:53.723460399 +0200
+++ git/dist/gcc/Make-lang.in 2018-05-13 03:56:53.719460403 +0200
@@ -103,7 +103,9 @@
echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads
echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
......
......@@ -11,32 +11,39 @@ Author: Andreas Bombe <aeb@debian.org>
Last-Update: 2018-01-12
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,12 +141,14 @@
Index: git/Makefile.in
===================================================================
--- git.orig/Makefile.in 2018-05-12 04:02:44.298941101 +0200
+++ git/Makefile.in 2018-05-12 04:13:09.226273023 +0200
@@ -145,14 +145,16 @@
include $(srcdir)/src/grt/Makefile.inc
version.tmp: $(srcdir)/src/version.in force
-# Create version.tmp from version.in, using git date/hash
- if test -d $(srcdir)/.git \
+# Create version.tmp from version.in, substituting @ORIGIN@ with suitable value
+# Create version.tmp from version.in, substituting @VER@ and @ORIGIN@ with suitable values
+ if [ -n "$(PKG_VERSION)" ]; then \
+ $(SED) -e "s/@ORIGIN@/$(PKG_VERSION)/" $< >$@; \
+ sub="$(PKG_VERSION)"; \
+ elif test -d $(srcdir)/.git \
&& desc=`cd $(srcdir); git describe --dirty`; then \
- $(SED) -e "s/[(].*[)]/($$desc)/" < $< > $@; \
+ $(SED) -e "s,@ORIGIN@,$$desc," $< >$@; \
- sub="s/[(].*[)]/($$desc)/"; \
+ sub="$$desc"; \
else \
- $(CP) $< $@; \
+ $(SED) -e "s/@ORIGIN@/tarball/" $< >$@; \
fi
- sub="s/tarball/tarball/"; \
+ sub="tarball"; \
fi; \
- $(SED) -e "$$sub" -e "s/@VER@/$(ghdl_version)/" < $< > $@; \
+ $(SED) -e "s,@ORIGIN@,$$sub," -e "s/@VER@/$(ghdl_version)/" < $< > $@; \
version.ads: version.tmp
--- a/src/version.in
+++ b/src/version.in
# Change version.ads only if version.tmp has been modified to avoid
Index: git/src/version.in
===================================================================
--- git.orig/src/version.in 2018-05-12 04:02:44.298941101 +0200
+++ git/src/version.in 2018-05-12 04:02:44.294941104 +0200
@@ -1,5 +1,5 @@
package Version is
Ghdl_Ver : constant String := "0.35";
Ghdl_Ver : constant String := "@VER@";
Ghdl_Release : constant String :=
- "(tarball) [Dunoon edition]";
+ "(@ORIGIN@) [Dunoon edition]";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment