Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 567694 Details for
Bug 679340
sci-electronics/ghdl - an open-source simulator for the VHDL language
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
ghdl_configuration.patch
ghdl_configuration.patch (text/plain), 4.27 KB, created by
Alex Orange
on 2019-03-03 22:18:21 UTC
(
hide
)
Description:
ghdl_configuration.patch
Filename:
MIME Type:
Creator:
Alex Orange
Created:
2019-03-03 22:18:21 UTC
Size:
4.27 KB
patch
obsolete
>diff --git a/Makefile.in b/Makefile.in >index 9f9f18f0..10e375ab 100644 >--- a/Makefile.in >+++ b/Makefile.in >@@ -15,12 +15,12 @@ > # along with GCC; see the file COPYING. If not, write to the Free > # Software Foundation, 59 Temple Place - Suite 330, Boston, MA > # 02111-1307, USA. >-CC=@CC@ >-CXX=@CXX@ >+CC=@ac_tool_prefix@@CC@ >+CXX=@ac_tool_prefix@@CXX@ > build=@build@ > srcdir=@srcdir@ > abs_srcdir=@abs_srcdir@ >-GNATMAKE=@GNATMAKE@ >+GNATMAKE=@ac_tool_prefix@@GNATMAKE@ > MAKE=@MAKE@ > prefix=@prefix@ > backend=@backend@ >@@ -47,7 +47,7 @@ INSTALL_DATA=install -m 644 > PWD?=$(shell pwd) > DESTDIR= > bindir=$(prefix)/bin >-libdir=$(prefix)/lib >+libdir=@libdir@ > incdir=$(prefix)/include > MKDIR=mkdir > LN=ln -s >@@ -56,7 +56,7 @@ MV=mv > SED=sed > GRT_RANLIB=ranlib > >-VHDL_LIB_DIR=$(prefix)/$(libdirsuffix) >+VHDL_LIB_DIR=$(libdir)/$(libdirsuffix) > > ifeq "$(enable_checks)" "true" > # Debug + checks >@@ -448,7 +448,7 @@ install.dirs: > $(MKDIR) -p $(DESTDIR)$(prefix) > $(MKDIR) -p $(DESTDIR)$(bindir) > $(MKDIR) -p $(DESTDIR)$(libdir) >- $(MKDIR) -p $(DESTDIR)$(prefix)/$(libdirsuffix) >+ $(MKDIR) -p $(DESTDIR)$(libdir)/$(libdirsuffix) > $(MKDIR) -p $(DESTDIR)$(incdir) > > install.vhdllib: install.dirs >diff --git a/configure b/configure >index af67d38c..82246c95 100755 >--- a/configure >+++ b/configure >@@ -33,7 +33,7 @@ GNATMAKE=${GNATMAKE:-gnatmake} > MAKE=${MAKE:-make} > LDFLAGS= > prefix=/usr/local >-libdirsuffix=lib/ghdl >+libdirsuffix=ghdl > libdirreverse=../.. > gcc_src_dir= > llvm_config= >@@ -48,11 +48,19 @@ enable_python=false > EXEEXT= > SOEXT=.so > PIC_FLAGS=-fPIC >+ac_tool_prefix= >+libdir= >+# Unused parameters >+mandir= >+infodir= >+datadir= >+sysconfdir= >+localstatedir= > > show_help=no > progname=$0 > >-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_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version" >+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_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version ac_tool_prefix libdir mandir infodir datadir sysconfdir localstatedir" > > # Find srcdir > srcdir=`dirname $progname` >@@ -108,6 +116,15 @@ for opt do > --disable-python) enable_python=false;; > --enable-coverage) build_mode="coverage";; > -h|-help|--help) show_help=yes;; >+ --build=*) build="$optarg";; >+ --host=*) host="$optarg";; >+ --libdir=*) libdir="$optarg";; >+ # Unused parameters >+ --mandir=*) mandir="$optarg";; >+ --infodir=*) infodir="$optarg";; >+ --datadir=*) datadir="$optarg";; >+ --sysconfdir=*) sysconfdir="$optarg";; >+ --localstatedir=*) localstatedir="$optarg";; > *) > echo "$0: unknown option $opt; try $0 --help" > exit 1 >@@ -115,6 +132,13 @@ for opt do > esac > done > >+ac_tool_prefix= >+test -n "$host_alias" && ac_tool_prefix=$host_alias- >+ >+if test "x$libdir" = "x"; then >+ libdir=$prefix/lib >+fi >+ > # Help > if test $show_help != no; then > cat <<EOF >@@ -371,7 +395,7 @@ sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \ > -e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \ > -e "s%@POST_PROCESSOR@%oread-$backend%" \ > -e "s%@INSTALL_PREFIX@%$prefix%" \ >- -e "s%@LIB_PREFIX@%$libdirsuffix%" \ >+ -e "s%@LIB_PREFIX@%$libdir/$libdirsuffix%" \ > -e "s%@SOEXT@%$SOEXT%" \ > -e "s%@default_pie@%$default_pie%" \ > < $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads >diff --git a/dist/gcc/Make-lang.in b/dist/gcc/Make-lang.in >index bf2290b1..bb11e9fc 100644 >--- a/dist/gcc/Make-lang.in >+++ b/dist/gcc/Make-lang.in >@@ -102,6 +102,7 @@ vhdl/default_paths.ads: Makefile > echo " Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads > echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads > echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads >+ # TODO: Fix this!!! > echo " Lib_Prefix : constant String :=">> tmp-dpaths.ads > echo " \"lib/ghdl\";" >> tmp-dpaths.ads > echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 679340
:
567692
| 567694 |
567696
|
568586
|
669935
|
669938
|
669947
|
736729
|
736732