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

(-)orig/configure (-3 / +31 lines)
Lines 33-39 Link Here
33
MAKE=${MAKE:-make}
33
MAKE=${MAKE:-make}
34
LDFLAGS=
34
LDFLAGS=
35
prefix=/usr/local
35
prefix=/usr/local
36
libdirsuffix=lib/ghdl
36
libdirsuffix=ghdl
37
libdirreverse=../..
37
libdirreverse=../..
38
gcc_src_dir=
38
gcc_src_dir=
39
llvm_config=
39
llvm_config=
Lines 50-60 Link Here
50
EXEEXT=
50
EXEEXT=
51
SOEXT=.so
51
SOEXT=.so
52
PIC_FLAGS=-fPIC
52
PIC_FLAGS=-fPIC
53
ac_tool_prefix=
54
libdir=
55
# Unused parameters
56
mandir=
57
infodir=
58
datadir=
59
sysconfdir=
60
localstatedir=
61
53
62
54
show_help=no
63
show_help=no
55
progname=$0
64
progname=$0
56
65
57
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_openieee enable_libghdl libghdl_version ghdl_version"
66
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_openieee enable_libghdl libghdl_version ghdl_version ac_tool_prefix libdir mandir infodir datadir sysconfdir localstatedir"
58
67
59
# Find srcdir
68
# Find srcdir
60
srcdir=`dirname $progname`
69
srcdir=`dirname $progname`
Lines 113-118 Link Here
113
    --default-pic)          default_pic=true;;
122
    --default-pic)          default_pic=true;;
114
    --enable-coverage)      build_mode="coverage";;
123
    --enable-coverage)      build_mode="coverage";;
115
    -h|-help|--help)        show_help=yes;;
124
    -h|-help|--help)        show_help=yes;;
125
    --build=*)              build="$optarg";;
126
    --host=*)               host="$optarg";;
127
    --libdir=*)             libdir="$optarg";;
128
    # Unused parameters
129
    --mandir=*)             mandir="$optarg";;
130
    --infodir=*)            infodir="$optarg";;
131
    --datadir=*)            datadir="$optarg";;
132
    --sysconfdir=*)         sysconfdir="$optarg";;
133
    --localstatedir=*)      localstatedir="$optarg";;
134
116
    *)
135
    *)
117
      echo "$0: unknown option $opt; try $0 --help"
136
      echo "$0: unknown option $opt; try $0 --help"
118
      exit 1
137
      exit 1
Lines 120-125 Link Here
120
  esac
139
  esac
121
done
140
done
122
141
142
ac_tool_prefix=
143
test -n "$host_alias" && ac_tool_prefix=$host_alias-
144
145
if test "x$libdir" = "x"; then
146
    libdir=$prefix/lib
147
fi
148
149
150
123
# Help
151
# Help
124
if test $show_help != no; then
152
if test $show_help != no; then
125
  cat <<EOF
153
  cat <<EOF
Lines 408-414 Link Here
408
    -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
436
    -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
409
    -e "s%@POST_PROCESSOR@%oread-$backend%" \
437
    -e "s%@POST_PROCESSOR@%oread-$backend%" \
410
    -e "s%@INSTALL_PREFIX@%$prefix%" \
438
    -e "s%@INSTALL_PREFIX@%$prefix%" \
411
    -e "s%@LIB_PREFIX@%$libdirsuffix%" \
439
    -e "s%@LIB_PREFIX@%$libdir/$libdirsuffix%" \
412
    -e "s%@SOEXT@%$SOEXT%" \
440
    -e "s%@SOEXT@%$SOEXT%" \
413
    -e "s%@default_pic@%$default_pic%" \
441
    -e "s%@default_pic@%$default_pic%" \
414
    < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
442
    < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
(-)orig/dist/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
(-)orig/Makefile.in (-5 / +5 lines)
Lines 15-26 Link Here
15
#  along with GCC; see the file COPYING.  If not, write to the Free
15
#  along with GCC; see the file COPYING.  If not, write to the Free
16
#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
16
#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
17
#  02111-1307, USA.
17
#  02111-1307, USA.
18
CC=@CC@
18
CC=@ac_tool_prefix@@CC@
19
CXX=@CXX@
19
CXX=@ac_tool_prefix@@CXX@
20
build=@build@
20
build=@build@
21
srcdir=@srcdir@
21
srcdir=@srcdir@
22
abs_srcdir=@abs_srcdir@
22
abs_srcdir=@abs_srcdir@
23
GNATMAKE=@GNATMAKE@
23
GNATMAKE=@ac_tool_prefix@@GNATMAKE@
24
MAKE=@MAKE@
24
MAKE=@MAKE@
25
prefix=@prefix@
25
prefix=@prefix@
26
backend=@backend@
26
backend=@backend@
Lines 48-54 Link Here
48
PWD?=$(shell pwd)
48
PWD?=$(shell pwd)
49
DESTDIR=
49
DESTDIR=
50
bindir=$(prefix)/bin
50
bindir=$(prefix)/bin
51
libdir=$(prefix)/lib
51
libdir=/lib
52
incdir=$(prefix)/include
52
incdir=$(prefix)/include
53
MKDIR=mkdir
53
MKDIR=mkdir
54
LN=ln -s
54
LN=ln -s
Lines 57-63 Link Here
57
SED=sed
57
SED=sed
58
GRT_RANLIB=ranlib
58
GRT_RANLIB=ranlib
59
59
60
VHDL_LIB_DIR=$(prefix)/$(libdirsuffix)
60
VHDL_LIB_DIR=$(libdir)/$(libdirsuffix)
61
61
62
ifeq "$(enable_checks)" "true"
62
ifeq "$(enable_checks)" "true"
63
 # Debug + checks
63
 # Debug + checks

Return to bug 679340