1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
Description: Patch installation paths for Debian packaging
Author: Andreas Bombe <aeb@debian.org>
Forwarded: not-needed
Last-Update: 2023-07-09
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.in
+++ b/Makefile.in
@@ -146,9 +146,9 @@
install: install.$(backend) install.vhdllib install.vpi install.libghdl install.ghw
# Generate std.standard package VHDL source
- "$(DESTDIR)$(bindir)/ghdl$(EXEEXT)" --disp-standard --std=87 > "$(DESTDIR)$(VHDL_LIB_DIR)/src/std/v87/standard.vhdl"
- "$(DESTDIR)$(bindir)/ghdl$(EXEEXT)" --disp-standard --std=93 > "$(DESTDIR)$(VHDL_LIB_DIR)/src/std/v93/standard.vhdl"
- "$(DESTDIR)$(bindir)/ghdl$(EXEEXT)" --disp-standard --std=08 > "$(DESTDIR)$(VHDL_LIB_DIR)/src/std/v08/standard.vhdl"
+ "$(DESTDIR)$(bindir)/ghdl-$(backend)$(EXEEXT)" --disp-standard --std=87 > "$(DESTDIR)$(VHDL_LIB_DIR)/src/std/v87/standard.vhdl"
+ "$(DESTDIR)$(bindir)/ghdl-$(backend)$(EXEEXT)" --disp-standard --std=93 > "$(DESTDIR)$(VHDL_LIB_DIR)/src/std/v93/standard.vhdl"
+ "$(DESTDIR)$(bindir)/ghdl-$(backend)$(EXEEXT)" --disp-standard --std=08 > "$(DESTDIR)$(VHDL_LIB_DIR)/src/std/v08/standard.vhdl"
uninstall: uninstall.$(backend) uninstall.vhdllib uninstall.vpi uninstall.libghdl uninstall.ghw
@@ -225,7 +225,7 @@
$(MAKE) -f $(srcdir)/libraries/Makefile.inc $(LIBVHDL_FLAGS_TO_PASS) GHDL="$(PWD)/ghdl_mcode$(EXEEXT)" XRUN=$(XRUN) GHDL_FLAGS="" VHDL_COPY_OBJS=no vhdl.libs.all
install.mcode.program: install.dirs ghdl_mcode$(EXEEXT)
- $(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) "$(DESTDIR)$(bindir)/ghdl$(EXEEXT)"
+ $(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) "$(DESTDIR)$(bindir)/ghdl-mcode$(EXEEXT)"
uninstall.mcode.program:
$(RM) "$(DESTDIR)$(bindir)/ghdl$(EXEEXT)"
@@ -426,8 +426,8 @@
LLVM_CONFIG="$(LLVM_CONFIG)" CXX="$(CXX)"
install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT)
- $(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
- $(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl1-llvm$(EXEEXT)
+ $(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl-llvm$(EXEEXT)
+ $(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(libdir)/ghdl1-llvm$(EXEEXT)
install.llvm_jit.program: install.dirs ghdl_llvm_jit$(EXEEXT)
$(INSTALL_PROGRAM) ghdl_llvm_jit$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT)
--- a/configure
+++ b/configure
@@ -38,6 +38,7 @@
prefix=/usr/local
libdirsuffix=lib
libghdldirsuffix=lib/ghdl
+libnativedirsuffix=lib
incdirsuffix=include
gcc_src_dir=
llvm_config=llvm-config
@@ -69,7 +70,7 @@
enable_gplcompat enable_libghdl libghdl_version ghdl_version
with_sundials sundials_incflags sundials_ldflags
COMPILER_GCC COMPILER_DEBUG COMPILER_MCODE COMPILER_LLVM POST_PROCESSOR
-INSTALL_PREFIX LIBDIR_SUFFIX LIBGHDLDIR_SUFFIX INCDIR_SUFFIX
+INSTALL_PREFIX LIBDIR_SUFFIX LIBGHDLDIR_SUFFIX INCDIR_SUFFIX LIBNATIVEDIR_SUFFIX
LLVM_LDFLAGS
"
@@ -112,6 +113,7 @@
--srcdir=*) srcdir="$optarg";;
--libdir=*) libdirsuffix="$optarg";;
--libghdldir=*) libghdldirsuffix="$optarg";;
+ --libnativedir=*) libnativedirsuffix="$optarg";;
--incdir=*) incdirsuffix="$optarg";;
--with-gcc=*) gcc_src_dir="$optarg"; backend=gcc;;
--with-llvm=*)
@@ -156,6 +158,7 @@
--srcdir=SRCDIR source code path [$srcdir]
--libdir=LIBDIR lib dir path relative to PREFIX [$libdirsuffix]
--libghdldir=LIBGHDLDIR ghdl lib dir path relative to PREFIX [$libdirsuffix]
+ --libnativedir=DIR libghdl dir relative to PREFIX [$libnativedir]
--incdir=INCDIR C include dir path relative to PREFIX [$incdirsuffix]
--with-gcc=DIR use gcc backend from DIR
--with-llvm-config[=LLVM-CONFIG] use llvm backend [llvm-config]
@@ -170,7 +173,8 @@
--disable-synth do not build with synthesis feature
Binaries are installed in PREFIX/bin
-Shared libraries are installed in PREFIX/LIBDIRSUFFIX
+VPI shared libraries are installed in PREFIX/LIBDIRSUFFIX
+Native shared libraries (libghdl) are installed in PREFIX/LIBNATIVEDIR
C header files are installed in PREFIX/INCDIR
GHDL libraries are installed in PREFIX/LIBGHDLDIR
EOF
@@ -372,11 +376,12 @@
COMPILER_GCC=ghdl1-gcc$EXEEXT
COMPILER_DEBUG=ghdl1-debug$EXEEXT
COMPILER_MCODE=ghdl1-mcode$EXEEXT
-COMPILER_LLVM=ghdl1-llvm$EXEEXT
+COMPILER_LLVM=lib/ghdl/llvm/ghdl1-llvm$EXEEXT
POST_PROCESSOR=oread-$backend
INSTALL_PREFIX=$prefix
LIBDIR_SUFFIX=$libdirsuffix
LIBGHDLDIR_SUFFIX=$libghdldirsuffix
+LIBNATIVEDIR_SUFFIX=$libnativedirsuffix
INCDIR_SUFFIX=$incdirsuffix
# Generate config.status
--- a/default_paths.ads.in
+++ b/default_paths.ads.in
@@ -25,6 +25,8 @@
"@LIBDIR_SUFFIX@";
LibGhdlDir_Suffix : constant String :=
"@LIBGHDLDIR_SUFFIX@";
+ LibNativeDir_Suffix : constant String :=
+ "@LIBNATIVEDIR_SUFFIX@";
IncDir_Suffix : constant String :=
"@INCDIR_SUFFIX@";
--- a/scripts/gcc/Make-lang.in.in
+++ b/scripts/gcc/Make-lang.in.in
@@ -109,6 +109,8 @@
echo " \"@LIBDIR_SUFFIX@\";" >> tmp-dpaths.ads
echo " LibGhdlDir_Suffix : constant String :=">> tmp-dpaths.ads
echo " \"@LIBGHDLDIR_SUFFIX@\";" >> tmp-dpaths.ads
+ echo " LibNativeDir_Suffix : constant String :=" >> tmp-dpaths.ads
+ echo " \"@LIBNATIVEDIR_SUFFIX@\";" >> tmp-dpaths.ads
echo " IncDir_Suffix : constant String :=" >> tmp-dpaths.ads
echo " \"@INCDIR_SUFFIX@\";" >> tmp-dpaths.ads
echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
@@ -169,8 +171,8 @@
# Install the driver program as ghdl.
vhdl.install-common: ghdl$(exeext) ghdl1$(exeext)
-mkdir $(DESTDIR)$(bindir)
- -$(RM) $(DESTDIR)$(bindir)/ghdl$(exeext)
- $(INSTALL_PROGRAM) ghdl$(exeext) $(DESTDIR)$(bindir)/ghdl$(exeext)
+ -$(RM) $(DESTDIR)$(bindir)/ghdl-gcc$(exeext)
+ $(INSTALL_PROGRAM) ghdl$(exeext) $(DESTDIR)$(bindir)/ghdl-gcc$(exeext)
-mkdir $(DESTDIR)$(libdir)
-mkdir $(DESTDIR)$(libdir)/ghdl
$(INSTALL_DATA) ../libbacktrace/.libs/libbacktrace.a $(DESTDIR)$(libdir)/ghdl
--- a/src/ghdldrv/ghdllib.adb
+++ b/src/ghdldrv/ghdllib.adb
@@ -45,7 +45,7 @@
end if;
return Ghdllocal.Exec_Prefix.all & Get_Directory_Separator
- & Default_Paths.LibDir_Suffix
+ & Default_Paths.LibNativeDir_Suffix
& Get_Directory_Separator & Get_Libghdl_Name;
end Get_Libghdl_Path;
|
