Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 679340 | Differences between
and this patch

Collapse All | Expand All

(-)ghdl-1.0.0/configure (-3 / +31 lines)
Lines 31-37 Link Here
31
MAKE=${MAKE:-make}
31
MAKE=${MAKE:-make}
32
LDFLAGS=
32
LDFLAGS=
33
prefix=/usr/local
33
prefix=/usr/local
34
libdirsuffix=lib/ghdl
34
libdirsuffix=ghdl
35
libdirreverse=../..
35
libdirreverse=../..
36
gcc_src_dir=
36
gcc_src_dir=
37
llvm_config=
37
llvm_config=
Lines 48-58 Link Here
48
EXEEXT=
48
EXEEXT=
49
SOEXT=.so
49
SOEXT=.so
50
PIC_FLAGS=-fPIC
50
PIC_FLAGS=-fPIC
51
ac_tool_prefix=
52
libdir=
53
# Unused parameters
54
mandir=
55
infodir=
56
datadir=
57
sysconfdir=
58
localstatedir=
59
51
60
52
show_help=no
61
show_help=no
53
progname=$0
62
progname=$0
54
63
55
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_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version"
64
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_pic enable_werror enable_checks enable_gplcompat enable_libghdl libghdl_version ghdl_version ac_tool_prefix libdir mandir infodir datadir sysconfdir localstatedir"
56
65
57
# Find srcdir
66
# Find srcdir
58
srcdir=`dirname $progname`
67
srcdir=`dirname $progname`
Lines 111-116 Link Here
111
    --default-pic)          default_pic=true;;
120
    --default-pic)          default_pic=true;;
112
    --enable-coverage)      build_mode="coverage";;
121
    --enable-coverage)      build_mode="coverage";;
113
    -h|-help|--help)        show_help=yes;;
122
    -h|-help|--help)        show_help=yes;;
123
    --build=*)              build="$optarg";;
124
    --host=*)               host="$optarg";;
125
    --libdir=*)             libdir="$optarg";;
126
    # Unused parameters
127
    --mandir=*)             mandir="$optarg";;
128
    --infodir=*)            infodir="$optarg";;
129
    --datadir=*)            datadir="$optarg";;
130
    --sysconfdir=*)         sysconfdir="$optarg";;
131
    --localstatedir=*)      localstatedir="$optarg";;
132
114
    *)
133
    *)
115
      echo "$0: unknown option $opt; try $0 --help"
134
      echo "$0: unknown option $opt; try $0 --help"
116
      exit 1
135
      exit 1
Lines 118-123 Link Here
118
  esac
137
  esac
119
done
138
done
120
139
140
ac_tool_prefix=
141
test -n "$host_alias" && ac_tool_prefix=$host_alias-
142
143
if test "x$libdir" = "x"; then
144
    libdir=$prefix/lib
145
fi
146
147
121
# Help
148
# Help
122
if test $show_help != no; then
149
if test $show_help != no; then
123
  cat <<EOF
150
  cat <<EOF
Lines 275-280 Link Here
275
       check_version  9.0 $llvm_version ||
302
       check_version  9.0 $llvm_version ||
276
       check_version 10.0 $llvm_version ||
303
       check_version 10.0 $llvm_version ||
277
       check_version 11.0 $llvm_version ||
304
       check_version 11.0 $llvm_version ||
305
       check_version 11.1 $llvm_version ||
278
       false; then
306
       false; then
279
    echo "Debugging is enabled with llvm $llvm_version"
307
    echo "Debugging is enabled with llvm $llvm_version"
280
  else
308
  else
Lines 403-409 Link Here
403
    -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
431
    -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
404
    -e "s%@POST_PROCESSOR@%oread-$backend%" \
432
    -e "s%@POST_PROCESSOR@%oread-$backend%" \
405
    -e "s%@INSTALL_PREFIX@%$prefix%" \
433
    -e "s%@INSTALL_PREFIX@%$prefix%" \
406
    -e "s%@LIB_PREFIX@%$libdirsuffix%" \
434
    -e "s%@LIB_PREFIX@%$libdir/$libdirsuffix%" \
407
    -e "s%@SOEXT@%$SOEXT%" \
435
    -e "s%@SOEXT@%$SOEXT%" \
408
    -e "s%@default_pic@%$default_pic%" \
436
    -e "s%@default_pic@%$default_pic%" \
409
    < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
437
    < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
(-)ghdl-1.0.0/Makefile.in (-5 / +5 lines)
Lines 13-24 Link Here
13
#
13
#
14
#  You should have received a copy of the GNU General Public License
14
#  You should have received a copy of the GNU General Public License
15
#  along with this program.  If not, see <gnu.org/licenses>.
15
#  along with this program.  If not, see <gnu.org/licenses>.
16
CC=@CC@
16
CC=@ac_tool_prefix@@CC@
17
CXX=@CXX@
17
CXX=@ac_tool_prefix@@CXX@
18
build=@build@
18
build=@build@
19
srcdir=@srcdir@
19
srcdir=@srcdir@
20
abs_srcdir=@abs_srcdir@
20
abs_srcdir=@abs_srcdir@
21
GNATMAKE=@GNATMAKE@
21
GNATMAKE=@ac_tool_prefix@@GNATMAKE@
22
MAKE=@MAKE@
22
MAKE=@MAKE@
23
prefix=@prefix@
23
prefix=@prefix@
24
backend=@backend@
24
backend=@backend@
Lines 46-52 Link Here
46
PWD?=$(shell pwd)
46
PWD?=$(shell pwd)
47
DESTDIR=
47
DESTDIR=
48
bindir=$(prefix)/bin
48
bindir=$(prefix)/bin
49
libdir=$(prefix)/lib
49
libdir=@libdir@
50
incdir=$(prefix)/include
50
incdir=$(prefix)/include
51
MKDIR=mkdir
51
MKDIR=mkdir
52
LN=ln -s
52
LN=ln -s
Lines 56-62 Link Here
56
GRT_RANLIB=ranlib
56
GRT_RANLIB=ranlib
57
GHDL_DESC?=tarball
57
GHDL_DESC?=tarball
58
58
59
VHDL_LIB_DIR=$(prefix)/$(libdirsuffix)
59
VHDL_LIB_DIR=$(libdir)/$(libdirsuffix)
60
60
61
ifeq "$(enable_checks)" "true"
61
ifeq "$(enable_checks)" "true"
62
 # Debug + checks
62
 # Debug + checks
(-)ghdl-1.0.0/scripts/gcc/Make-lang.in (+1 lines)
Lines 103-108 Link Here
103
	echo "   Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads
103
	echo "   Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads
104
	echo "   Compiler_Llvm  : constant String := \"\";" >> tmp-dpaths.ads
104
	echo "   Compiler_Llvm  : constant String := \"\";" >> tmp-dpaths.ads
105
	echo "   Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
105
	echo "   Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
106
	# TODO: Fix this!!!
106
	echo "   Lib_Prefix     : constant String :=">> tmp-dpaths.ads
107
	echo "   Lib_Prefix     : constant String :=">> tmp-dpaths.ads
107
	echo "     \"lib/ghdl\";" >> tmp-dpaths.ads
108
	echo "     \"lib/ghdl\";" >> tmp-dpaths.ads
108
	echo "   Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
109
	echo "   Shared_Library_Extension : constant String :=">> tmp-dpaths.ads

Return to bug 679340