Commit ecce7402 authored by Jonathan McDowell's avatar Jonathan McDowell

Refresh modify-install-paths patch

parent bb449ebf
ghdl (0.35+git20181129+dfsg-1) UNRELEASED; urgency=medium
* New upstream release
* Refresh modify-install-paths
-- Jonathan McDowell <noodles@earth.li> Tue, 11 Dec 2018 20:16:23 +0000
......
Description: Patch installation paths for Debian packaging
Author: Andreas Bombe <aeb@debian.org>
Last-Update: 2018-01-12
Last-Update: 2018-12-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@
Index: ghdl/Makefile.in
===================================================================
--- ghdl.orig/Makefile.in
+++ ghdl/Makefile.in
@@ -26,6 +26,7 @@ prefix=@prefix@
backend=@backend@
libdirsuffix=@libdirsuffix@
libdirreverse=@libdirreverse@
......@@ -13,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
EXEEXT=@EXEEXT@
SOEXT=@SOEXT@
PIC_FLAGS=@PIC_FLAGS@
@@ -47,8 +48,8 @@
@@ -47,8 +48,8 @@ INSTALL_DATA=install -m 644
PWD=$(CURDIR)
DESTDIR=
bindir=$(prefix)/bin
......@@ -24,7 +26,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
MKDIR=mkdir
LN=ln -s
CP=cp
@@ -56,7 +57,7 @@
@@ -56,7 +57,7 @@ MV=mv
SED=sed
GRT_RANLIB=ranlib
......@@ -33,7 +35,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
ifeq "$(enable_checks)" "true"
# Debug + checks
@@ -179,7 +180,7 @@
@@ -179,7 +180,7 @@ libs.vhdl.mcode: ghdl_mcode$(EXEEXT)
$(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)
......@@ -42,7 +44,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
install.mcode: install.mcode.program install.vhdllib install.vpi
@@ -317,8 +318,8 @@
@@ -321,8 +322,8 @@ oread-llvm$(EXEEXT): force
LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
......@@ -53,9 +55,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
install.llvm: install.llvm.program install.vhdllib install.grt install.vpi
--- a/configure
+++ b/configure
@@ -19,6 +19,7 @@
Index: ghdl/configure
===================================================================
--- ghdl.orig/configure
+++ ghdl/configure
@@ -19,6 +19,7 @@ MAKE=${MAKE:-make}
LDFLAGS=
prefix=/usr/local
libdirsuffix=lib/ghdl
......@@ -63,7 +67,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
libdirreverse=../..
gcc_src_dir=
llvm_config=
@@ -37,7 +38,7 @@
@@ -37,7 +38,7 @@ PIC_FLAGS=-fPIC
show_help=no
progname=$0
......@@ -72,7 +76,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# Find srcdir
srcdir=`dirname $progname`
@@ -76,6 +77,8 @@
@@ -76,6 +77,8 @@ for opt do
;;
--prefix=*) prefix="$optarg";;
--srcdir=*) srcdir="$optarg";;
......@@ -81,7 +85,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--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;;
@@ -106,6 +109,8 @@
@@ -106,6 +109,8 @@ Usage: configure [options]
Options [defaults in brackets]:
--prefix=PREFIX install in PREFIX [$prefix]
--srcdir=SRCDIR source code path [$srcdir]
......@@ -90,11 +94,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--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
@@ -350,10 +355,11 @@
@@ -352,10 +357,11 @@ echo "Generate default_paths.ads"
sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \
-e "s%@COMPILER_DEBUG@%ghdl1-debug$EXEEXT%" \
-e "s%@COMPILER_MCODE@%ghdl1-mcode$EXEEXT%" \
- -e "s%@COMPILER_LLVM@%bin/ghdl1-llvm$EXEEXT%" \
- -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
+ -e "s%@COMPILER_LLVM@%lib/ghdl/llvm/ghdl1-llvm$EXEEXT%" \
-e "s%@POST_PROCESSOR@%oread-$backend%" \
-e "s%@INSTALL_PREFIX@%$prefix%" \
......@@ -103,9 +107,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-e "s%@SOEXT@%$SOEXT%" \
-e "s%@default_pie@%$default_pie%" \
< $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
--- a/src/ghdldrv/default_paths.ads.in
+++ b/src/ghdldrv/default_paths.ads.in
@@ -25,6 +25,8 @@
Index: ghdl/src/ghdldrv/default_paths.ads.in
===================================================================
--- ghdl.orig/src/ghdldrv/default_paths.ads.in
+++ ghdl/src/ghdldrv/default_paths.ads.in
@@ -25,6 +25,8 @@ package Default_Paths is
"@INSTALL_PREFIX@";
Lib_Prefix : constant String :=
"@LIB_PREFIX@";
......@@ -114,9 +120,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Compiler_Gcc : constant String :=
"@COMPILER_GCC@";
--- a/src/ghdldrv/ghdlvpi.adb
+++ b/src/ghdldrv/ghdlvpi.adb
@@ -38,7 +38,7 @@
Index: ghdl/src/ghdldrv/ghdlvpi.adb
===================================================================
--- ghdl.orig/src/ghdldrv/ghdlvpi.adb
+++ ghdl/src/ghdldrv/ghdlvpi.adb
@@ -38,7 +38,7 @@ package body Ghdlvpi is
-- Compute install path
Ghdllocal.Set_Exec_Prefix;
......@@ -125,7 +133,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end Get_Vpi_Include_Dir;
-- Return the lib directory.
@@ -49,7 +49,7 @@
@@ -49,7 +49,7 @@ package body Ghdlvpi is
Ghdllocal.Set_Exec_Prefix;
end if;
......@@ -134,9 +142,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
end Get_Vpi_Lib_Dir;
-- Return the lib directory, but unixify the path (for a unix shell in
--- a/dist/gcc/Make-lang.in
+++ b/dist/gcc/Make-lang.in
@@ -103,7 +103,9 @@
Index: ghdl/dist/gcc/Make-lang.in
===================================================================
--- ghdl.orig/dist/gcc/Make-lang.in
+++ ghdl/dist/gcc/Make-lang.in
@@ -103,7 +103,9 @@ vhdl/default_paths.ads: Makefile
echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads
echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
echo " Lib_Prefix : constant String :=">> tmp-dpaths.ads
......@@ -147,7 +157,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
echo " \"$(VHDL_SOEXT)\";" >> tmp-dpaths.ads
echo " Default_Pie : constant Boolean := False;" >> tmp-dpaths.ads
@@ -153,8 +155,8 @@
@@ -153,8 +155,8 @@ vhdl.install-plugin:
# Install the driver program as ghdl.
vhdl.install-common: ghdl$(exeext) ghdl1$(exeext)
-mkdir $(DESTDIR)$(bindir)
......@@ -158,9 +168,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-mkdir $(DESTDIR)$(libdir)
-mkdir $(DESTDIR)$(libdir)/ghdl
$(INSTALL_DATA) ../libbacktrace/.libs/libbacktrace.a $(DESTDIR)$(libdir)/ghdl
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -317,9 +317,9 @@
Index: ghdl/src/ghdldrv/ghdllocal.adb
===================================================================
--- ghdl.orig/src/ghdldrv/ghdllocal.adb
+++ ghdl/src/ghdldrv/ghdllocal.adb
@@ -318,9 +318,9 @@ package body Ghdllocal is
function Get_Machine_Path_Prefix return String is
begin
if Flag_32bit then
......
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