Attachment #522476 for bug #649700




	echo "$version" ;;

  --ldflags | -ldflags | -l)
	echo "-L$libdir/freehdl -L$libdir" ;;

  --libtool | -libtool | -libs)
	echo "-lfreehdl-kernel -lfreehdl-std" ;;

  --ieee | -ieee)
	echo "-lieee" ;;

  --cxxflags | -cxxflags | -c)
	echo "$cxxflags -I$includedir" ;;

Lines 9-15 Link Here

(-)freehdl-0.0.8.orig/v2cc/gvhdl.in (-2 / +2 lines)
9	my $vhdl_source_name = "";	9	my $vhdl_source_name = "";
10	my $source = "";	10	my $source = "";
11	my $includes = "";	11	my $includes = "";
12	my $cpplibs = "-lm FREEHDL/lib/libfreehdl-kernel.la FREEHDL/lib/libfreehdl-std.la";	12	my $cpplibs = "-lm -lfreehdl-kernel -lfreehdl-std";
13	my $vhdl_library = ""; # Library the design entity is compiled into	13	my $vhdl_library = ""; # Library the design entity is compiled into
14	my $cpp_options = "";	14	my $cpp_options = "";
15	my $vhdl_options = "";	15	my $vhdl_options = "";
Lines 148-154 Link Here
148	} elsif ($argument =~ /^\--relaxed-component-visibility/) {	148	} elsif ($argument =~ /^\--relaxed-component-visibility/) {
149	$vhdl_options = $vhdl_options . " --relaxed-component-visibility";	149	$vhdl_options = $vhdl_options . " --relaxed-component-visibility";
150	} elsif ($argument =~ /^\--libieee/) {	150	} elsif ($argument =~ /^\--libieee/) {
151	$cpplibs .= " " . update ("FREEHDL/lib/freehdl/libieee.la");	151	# $cpplibs .= " " . update ("FREEHDL/lib/freehdl/libieee.la");
152	} elsif ($argument =~ /^\-/) {	152	} elsif ($argument =~ /^\-/) {
153	$cpp_options = $cpp_options . " " . $argument;	153	$cpp_options = $cpp_options . " " . $argument;
154	} else {	154	} else {

Return to bug 649700

Lines 36-48 Link Here

(-)freehdl-0.0.8.orig/freehdl/freehdl-config (-3 / +3 lines)
36	echo "$version" ;;	36	echo "$version" ;;
37		37
38	--ldflags \| -ldflags \| -l)	38	--ldflags \| -ldflags \| -l)
39	echo "-L$libdir" ;;	39	echo "-L$libdir/freehdl -L$libdir" ;;
40		40
41	--libtool \| -libtool \| -libs)	41	--libtool \| -libtool \| -libs)
42	echo "$libdir/libfreehdl-kernel.la $libdir/libfreehdl-std.la" ;;	42	echo "-lfreehdl-kernel -lfreehdl-std" ;;
43		43
44	--ieee \| -ieee)	44	--ieee \| -ieee)
45	echo "$libdir/freehdl/libieee.la" ;;	45	echo "-lieee" ;;
46		46
47	--cxxflags \| -cxxflags \| -c)	47	--cxxflags \| -cxxflags \| -c)
48	echo "$cxxflags -I$includedir" ;;	48	echo "$cxxflags -I$includedir" ;;