Commit 7e0ba092 authored by Andreas Bombe's avatar Andreas Bombe

Change installation paths for VHDL libraries

The libraries relevant for VHDL (IEEE libraries and static and shared
libraries linked into simulation executables) now reside in
/usr/lib/ghdl/<backend>/vhdl.
parent 895f335d
usr/bin/ghdl-gcc
usr/lib/ghdl/gcc/libexec/gcc/*/*/ghdl1
usr/lib/ghdl/gcc/*.a
usr/lib/ghdl/gcc/*.so
usr/lib/ghdl/gcc/grt.*
usr/lib/ghdl/gcc/vhdl/*.a
usr/lib/ghdl/gcc/vhdl/grt.*
usr/lib/ghdl/gcc/vhdl/src
usr/lib/ghdl/gcc/vhdl/std
usr/lib/ghdl/gcc/vhdl/ieee
usr/lib/ghdl/gcc/vhdl/synopsys
usr/bin/ghdl-llvm
usr/lib/ghdl/llvm
usr/lib/ghdl/llvm/ghdl1-llvm
usr/lib/ghdl/llvm/libghdlvpi.so
usr/lib/ghdl/llvm/vhdl/*.a
usr/lib/ghdl/llvm/vhdl/grt.*
usr/lib/ghdl/llvm/vhdl/src
usr/lib/ghdl/llvm/vhdl/std
usr/lib/ghdl/llvm/vhdl/ieee
usr/lib/ghdl/llvm/vhdl/synopsys
usr/bin/ghdl-mcode
usr/lib/ghdl/mcode
usr/lib/ghdl/mcode/libghdlvpi.so
usr/lib/ghdl/mcode/vhdl/src
usr/lib/ghdl/mcode/vhdl/std
usr/lib/ghdl/mcode/vhdl/ieee
usr/lib/ghdl/mcode/vhdl/synopsys
......@@ -3,10 +3,8 @@ Author: Andreas Bombe <aeb@debian.org>
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-05-13 03:56:53.723460399 +0200
+++ git/Makefile.in 2018-05-13 03:56:53.719460403 +0200
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@
backend=@backend@
libdirsuffix=@libdirsuffix@
......@@ -26,6 +24,15 @@ Index: git/Makefile.in
MKDIR=mkdir
LN=ln -s
CP=cp
@@ -56,7 +57,7 @@
SED=sed
GRT_RANLIB=ranlib
-VHDL_LIB_DIR=$(prefix)/$(libdirsuffix)
+VHDL_LIB_DIR=$(prefix)/$(libdirsuffix)/vhdl
ifeq "$(enable_checks)" "true"
# Debug + checks
@@ -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
......@@ -46,10 +53,8 @@ Index: git/Makefile.in
install.llvm: install.llvm.program install.vhdllib install.grt install.vpi
Index: git/configure
===================================================================
--- git.orig/configure 2018-05-13 03:56:53.723460399 +0200
+++ git/configure 2018-05-13 03:58:07.059372574 +0200
--- a/configure
+++ b/configure
@@ -19,6 +19,7 @@
LDFLAGS=
prefix=/usr/local
......@@ -98,10 +103,8 @@ Index: git/configure
-e "s%@SOEXT@%$SOEXT%" \
-e "s%@default_pie@%$default_pie%" \
< $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 2018-05-13 03:56:53.723460399 +0200
+++ git/src/ghdldrv/default_paths.ads.in 2018-05-13 03:56:53.719460403 +0200
--- a/src/ghdldrv/default_paths.ads.in
+++ b/src/ghdldrv/default_paths.ads.in
@@ -25,6 +25,8 @@
"@INSTALL_PREFIX@";
Lib_Prefix : constant String :=
......@@ -111,10 +114,8 @@ Index: git/src/ghdldrv/default_paths.ads.in
Compiler_Gcc : constant String :=
"@COMPILER_GCC@";
Index: git/src/ghdldrv/ghdlvpi.adb
===================================================================
--- 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
--- a/src/ghdldrv/ghdlvpi.adb
+++ b/src/ghdldrv/ghdlvpi.adb
@@ -38,7 +38,7 @@
-- Compute install path
Ghdllocal.Set_Exec_Prefix;
......@@ -133,10 +134,8 @@ Index: git/src/ghdldrv/ghdlvpi.adb
end Get_Vpi_Lib_Dir;
-- 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 2018-05-13 03:56:53.723460399 +0200
+++ git/dist/gcc/Make-lang.in 2018-05-13 03:56:53.719460403 +0200
--- a/dist/gcc/Make-lang.in
+++ b/dist/gcc/Make-lang.in
@@ -103,7 +103,9 @@
echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads
echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
......@@ -159,3 +158,17 @@ Index: git/dist/gcc/Make-lang.in
-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 @@
function Get_Machine_Path_Prefix return String is
begin
if Flag_32bit then
- return Lib_Prefix_Path.all & "32";
+ return Lib_Prefix_Path.all & "32" & Directory_Separator & "vhdl";
else
- return Lib_Prefix_Path.all;
+ return Lib_Prefix_Path.all & Directory_Separator & "vhdl";
end if;
end Get_Machine_Path_Prefix;
......@@ -147,7 +147,7 @@ override_dh_auto_install:
DESTDIR=$(CURDIR)/debian/tmp; \
$(MAKE) -C $(BUILDDIR)/gcc install DESTDIR=$(CURDIR)/debian/tmp; \
mv debian/tmp/usr/lib/ghdl/gcc/bin/ghdl-gcc debian/tmp/usr/bin/ghdl-gcc; \
mv debian/tmp/usr/lib/ghdl/gcc/lib/ghdl/libbacktrace.a debian/tmp/usr/lib/ghdl/gcc/libbacktrace.a; \
mv debian/tmp/usr/lib/ghdl/gcc/lib/ghdl/libbacktrace.a debian/tmp/usr/lib/ghdl/gcc/vhdl/libbacktrace.a; \
fi
@echo
@echo ------------------------------------------------------------
......@@ -155,16 +155,16 @@ override_dh_auto_install:
@echo ------------------------------------------------------------
if [ -n "$(WITH_MCODE)" ]; then \
$(RM) -r debian/tmp/usr/lib/ghdl/src; \
mv debian/tmp/usr/lib/ghdl/mcode/src debian/tmp/usr/lib/ghdl; \
ln -s ../src debian/tmp/usr/lib/ghdl/mcode/src; \
mv debian/tmp/usr/lib/ghdl/mcode/vhdl/src debian/tmp/usr/lib/ghdl; \
ln -s ../../src debian/tmp/usr/lib/ghdl/mcode/vhdl/src; \
fi
if [ -n "$(WITH_LLVM)" ]; then \
$(RM) -r debian/tmp/usr/lib/ghdl/src; \
mv debian/tmp/usr/lib/ghdl/llvm/src debian/tmp/usr/lib/ghdl; \
ln -s ../src debian/tmp/usr/lib/ghdl/llvm/src; \
mv debian/tmp/usr/lib/ghdl/llvm/vhdl/src debian/tmp/usr/lib/ghdl; \
ln -s ../../src debian/tmp/usr/lib/ghdl/llvm/vhdl/src; \
fi
if [ -n "$(WITH_GCC)" ]; then \
$(RM) -r debian/tmp/usr/lib/ghdl/src; \
mv debian/tmp/usr/lib/ghdl/gcc/src debian/tmp/usr/lib/ghdl; \
ln -s ../src debian/tmp/usr/lib/ghdl/gcc/src; \
mv debian/tmp/usr/lib/ghdl/gcc/vhdl/src debian/tmp/usr/lib/ghdl; \
ln -s ../../src debian/tmp/usr/lib/ghdl/gcc/vhdl/src; \
fi
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