pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ghdl-dev: Worked around gcc6-aux dep, mcode build for Linux, llvm for other OSes
Module Name: pkgsrc-wip
Committed By: Mayuresh <mayuresh%acm.org@localhost>
Pushed By: mayuresh
Date: Mon Jan 13 05:23:03 2025 +0530
Changeset: 9f619cd69b7453c2c77ee9a45620b6992caba09b
Modified Files:
ghdl-dev/Makefile
ghdl-dev/PLIST
Log Message:
ghdl-dev: Worked around gcc6-aux dep, mcode build for Linux, llvm for other OSes
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9f619cd69b7453c2c77ee9a45620b6992caba09b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ghdl-dev/Makefile | 20 +++++-
ghdl-dev/PLIST | 192 +++++++++++++++++++++++++++---------------------------
2 files changed, 113 insertions(+), 99 deletions(-)
diffs:
diff --git a/ghdl-dev/Makefile b/ghdl-dev/Makefile
index f07bd3a241..530501b144 100644
--- a/ghdl-dev/Makefile
+++ b/ghdl-dev/Makefile
@@ -16,19 +16,33 @@ LICENSE= gnu-gpl-v2
HAS_CONFIGURE= yes
USE_TOOLS+= gmake
USE_LANGUAGES+= c c++ # ada
-TOOL_DEPENDS+= gcc10-aux-[0-9]*:../../lang/gcc10-aux
REPLACE_BASH= scripts/vendors/*.sh
+
RELRO_SUPPORTED= no
MKPIE_SUPPORTED= no
-CONFIGURE_ENV+= GNATMAKE=${PREFIX}/gcc10-aux/bin/gnatmake
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --enable-synth
CONFIGURE_ARGS+= --enable-libghdl
-CONFIGURE_ARGS+= --with-llvm-config=${PREFIX}/bin/llvm-config
+
+# gcc6-aux dependency is not met on Linux. Besides on Linux mcode backend is preferred, llvm on NetBSD (and possibly others)
+
+PLIST_VARS+= llvm
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Linux"
+TOOL_DEPENDS+= gcc10-aux-[0-9]*:../../lang/gcc10-aux
+CONFIGURE_ENV+= GNATMAKE=${PREFIX}/gcc10-aux/bin/gnatmake
+CONFIGURE_ARGS+= --with-llvm-config=${PREFIX}/bin/llvm-config
BUILDLINK_DEPMETHOD.clang= build
.include "../../lang/clang/buildlink3.mk"
.include "../../lang/llvm/buildlink3.mk"
+PLIST.llvm= yes
+.else
+# Since we can't build gcc6-aux on Linux, which bootstraps higher gcc versions
+CONFIGURE_ENV+= GNATMAKE=/usr/bin/gnatmake
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff --git a/ghdl-dev/PLIST b/ghdl-dev/PLIST
index dc5f9afd74..b9fcea93db 100644
--- a/ghdl-dev/PLIST
+++ b/ghdl-dev/PLIST
@@ -1,6 +1,6 @@
@comment $NetBSD$
bin/ghdl
-bin/ghdl1-llvm
+${PLIST.llvm}bin/ghdl1-llvm
bin/ghwdump
include/ghdl/libghw.h
include/ghdl/synth.h
@@ -8,93 +8,93 @@ include/ghdl/synth_gates.h
include/ghdl/vhpi_user.h
include/ghdl/vpi_user.h
lib/ghdl/ansi_color.sh
-lib/ghdl/grt-exec.lst
-lib/ghdl/grt-shared.lst
-lib/ghdl/grt.lst
-lib/ghdl/grt.ver
-lib/ghdl/ieee/v08/fixed_float_types.o
-lib/ghdl/ieee/v08/fixed_generic_pkg-body.o
-lib/ghdl/ieee/v08/fixed_generic_pkg.o
-lib/ghdl/ieee/v08/fixed_pkg.o
-lib/ghdl/ieee/v08/float_generic_pkg-body.o
-lib/ghdl/ieee/v08/float_generic_pkg.o
-lib/ghdl/ieee/v08/float_pkg.o
+${PLIST.llvm}lib/ghdl/grt-exec.lst
+${PLIST.llvm}lib/ghdl/grt-shared.lst
+${PLIST.llvm}lib/ghdl/grt.lst
+${PLIST.llvm}lib/ghdl/grt.ver
+${PLIST.llvm}lib/ghdl/ieee/v08/fixed_float_types.o
+${PLIST.llvm}lib/ghdl/ieee/v08/fixed_generic_pkg-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/fixed_generic_pkg.o
+${PLIST.llvm}lib/ghdl/ieee/v08/fixed_pkg.o
+${PLIST.llvm}lib/ghdl/ieee/v08/float_generic_pkg-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/float_generic_pkg.o
+${PLIST.llvm}lib/ghdl/ieee/v08/float_pkg.o
lib/ghdl/ieee/v08/ieee-obj08.cf
-lib/ghdl/ieee/v08/ieee_bit_context.o
-lib/ghdl/ieee/v08/ieee_std_context.o
-lib/ghdl/ieee/v08/math_complex-body.o
-lib/ghdl/ieee/v08/math_complex.o
-lib/ghdl/ieee/v08/math_real-body.o
-lib/ghdl/ieee/v08/math_real.o
-lib/ghdl/ieee/v08/memory_b.o
-lib/ghdl/ieee/v08/memory_p.o
-lib/ghdl/ieee/v08/numeric_bit-body.o
-lib/ghdl/ieee/v08/numeric_bit.o
-lib/ghdl/ieee/v08/numeric_bit_unsigned-body.o
-lib/ghdl/ieee/v08/numeric_bit_unsigned.o
-lib/ghdl/ieee/v08/numeric_std-body.o
-lib/ghdl/ieee/v08/numeric_std.o
-lib/ghdl/ieee/v08/numeric_std_unsigned-body.o
-lib/ghdl/ieee/v08/numeric_std_unsigned.o
-lib/ghdl/ieee/v08/prmtvs_b.o
-lib/ghdl/ieee/v08/prmtvs_p.o
-lib/ghdl/ieee/v08/std_logic_1164-body.o
-lib/ghdl/ieee/v08/std_logic_1164.o
-lib/ghdl/ieee/v08/std_logic_arith.o
-lib/ghdl/ieee/v08/std_logic_misc-body.o
-lib/ghdl/ieee/v08/std_logic_misc.o
-lib/ghdl/ieee/v08/std_logic_signed.o
-lib/ghdl/ieee/v08/std_logic_textio.o
-lib/ghdl/ieee/v08/std_logic_unsigned.o
-lib/ghdl/ieee/v08/timing_b.o
-lib/ghdl/ieee/v08/timing_p.o
-lib/ghdl/ieee/v08/upf-body.o
-lib/ghdl/ieee/v08/upf.o
+${PLIST.llvm}lib/ghdl/ieee/v08/ieee_bit_context.o
+${PLIST.llvm}lib/ghdl/ieee/v08/ieee_std_context.o
+${PLIST.llvm}lib/ghdl/ieee/v08/math_complex-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/math_complex.o
+${PLIST.llvm}lib/ghdl/ieee/v08/math_real-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/math_real.o
+${PLIST.llvm}lib/ghdl/ieee/v08/memory_b.o
+${PLIST.llvm}lib/ghdl/ieee/v08/memory_p.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_bit-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_bit.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_bit_unsigned-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_bit_unsigned.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_std-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_std.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_std_unsigned-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/numeric_std_unsigned.o
+${PLIST.llvm}lib/ghdl/ieee/v08/prmtvs_b.o
+${PLIST.llvm}lib/ghdl/ieee/v08/prmtvs_p.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_1164-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_1164.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_arith.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_misc-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_misc.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_signed.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_textio.o
+${PLIST.llvm}lib/ghdl/ieee/v08/std_logic_unsigned.o
+${PLIST.llvm}lib/ghdl/ieee/v08/timing_b.o
+${PLIST.llvm}lib/ghdl/ieee/v08/timing_p.o
+${PLIST.llvm}lib/ghdl/ieee/v08/upf-body.o
+${PLIST.llvm}lib/ghdl/ieee/v08/upf.o
lib/ghdl/ieee/v87/ieee-obj87.cf
-lib/ghdl/ieee/v87/numeric_bit-body.o
-lib/ghdl/ieee/v87/numeric_bit.o
-lib/ghdl/ieee/v87/numeric_std-body.o
-lib/ghdl/ieee/v87/numeric_std.o
-lib/ghdl/ieee/v87/std_logic_1164-body.o
-lib/ghdl/ieee/v87/std_logic_1164.o
-lib/ghdl/ieee/v87/std_logic_arith.o
-lib/ghdl/ieee/v87/std_logic_misc-body.o
-lib/ghdl/ieee/v87/std_logic_misc.o
-lib/ghdl/ieee/v87/std_logic_signed.o
-lib/ghdl/ieee/v87/std_logic_textio.o
-lib/ghdl/ieee/v87/std_logic_unsigned.o
-lib/ghdl/ieee/v87/upf-body.o
-lib/ghdl/ieee/v87/upf.o
-lib/ghdl/ieee/v87/vital_primitives-body.o
-lib/ghdl/ieee/v87/vital_primitives.o
-lib/ghdl/ieee/v87/vital_timing-body.o
-lib/ghdl/ieee/v87/vital_timing.o
+${PLIST.llvm}lib/ghdl/ieee/v87/numeric_bit-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/numeric_bit.o
+${PLIST.llvm}lib/ghdl/ieee/v87/numeric_std-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/numeric_std.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_1164-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_1164.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_arith.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_misc-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_misc.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_signed.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_textio.o
+${PLIST.llvm}lib/ghdl/ieee/v87/std_logic_unsigned.o
+${PLIST.llvm}lib/ghdl/ieee/v87/upf-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/upf.o
+${PLIST.llvm}lib/ghdl/ieee/v87/vital_primitives-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/vital_primitives.o
+${PLIST.llvm}lib/ghdl/ieee/v87/vital_timing-body.o
+${PLIST.llvm}lib/ghdl/ieee/v87/vital_timing.o
lib/ghdl/ieee/v93/ieee-obj93.cf
-lib/ghdl/ieee/v93/math_complex-body.o
-lib/ghdl/ieee/v93/math_complex.o
-lib/ghdl/ieee/v93/math_real-body.o
-lib/ghdl/ieee/v93/math_real.o
-lib/ghdl/ieee/v93/memory_b.o
-lib/ghdl/ieee/v93/memory_p.o
-lib/ghdl/ieee/v93/numeric_bit-body.o
-lib/ghdl/ieee/v93/numeric_bit.o
-lib/ghdl/ieee/v93/numeric_std-body.o
-lib/ghdl/ieee/v93/numeric_std.o
-lib/ghdl/ieee/v93/prmtvs_b.o
-lib/ghdl/ieee/v93/prmtvs_p.o
-lib/ghdl/ieee/v93/std_logic_1164-body.o
-lib/ghdl/ieee/v93/std_logic_1164.o
-lib/ghdl/ieee/v93/std_logic_arith.o
-lib/ghdl/ieee/v93/std_logic_misc-body.o
-lib/ghdl/ieee/v93/std_logic_misc.o
-lib/ghdl/ieee/v93/std_logic_signed.o
-lib/ghdl/ieee/v93/std_logic_textio.o
-lib/ghdl/ieee/v93/std_logic_unsigned.o
-lib/ghdl/ieee/v93/timing_b.o
-lib/ghdl/ieee/v93/timing_p.o
-lib/ghdl/ieee/v93/upf-body.o
-lib/ghdl/ieee/v93/upf.o
-lib/ghdl/libgrt.a
+${PLIST.llvm}lib/ghdl/ieee/v93/math_complex-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/math_complex.o
+${PLIST.llvm}lib/ghdl/ieee/v93/math_real-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/math_real.o
+${PLIST.llvm}lib/ghdl/ieee/v93/memory_b.o
+${PLIST.llvm}lib/ghdl/ieee/v93/memory_p.o
+${PLIST.llvm}lib/ghdl/ieee/v93/numeric_bit-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/numeric_bit.o
+${PLIST.llvm}lib/ghdl/ieee/v93/numeric_std-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/numeric_std.o
+${PLIST.llvm}lib/ghdl/ieee/v93/prmtvs_b.o
+${PLIST.llvm}lib/ghdl/ieee/v93/prmtvs_p.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_1164-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_1164.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_arith.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_misc-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_misc.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_signed.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_textio.o
+${PLIST.llvm}lib/ghdl/ieee/v93/std_logic_unsigned.o
+${PLIST.llvm}lib/ghdl/ieee/v93/timing_b.o
+${PLIST.llvm}lib/ghdl/ieee/v93/timing_p.o
+${PLIST.llvm}lib/ghdl/ieee/v93/upf-body.o
+${PLIST.llvm}lib/ghdl/ieee/v93/upf.o
+${PLIST.llvm}lib/ghdl/libgrt.a
lib/ghdl/src/ieee/math_complex-body.vhdl
lib/ghdl/src/ieee/math_complex.vhdl
lib/ghdl/src/ieee/math_real-body.vhdl
@@ -167,20 +167,20 @@ lib/ghdl/src/vital95/vital_primitives-body.vhdl
lib/ghdl/src/vital95/vital_primitives.vhdl
lib/ghdl/src/vital95/vital_timing-body.vhdl
lib/ghdl/src/vital95/vital_timing.vhdl
-lib/ghdl/std/v08/env-body.o
-lib/ghdl/std/v08/env.o
+${PLIST.llvm}lib/ghdl/std/v08/env-body.o
+${PLIST.llvm}lib/ghdl/std/v08/env.o
lib/ghdl/std/v08/std-obj08.cf
-lib/ghdl/std/v08/std_standard.o
-lib/ghdl/std/v08/textio-body.o
-lib/ghdl/std/v08/textio.o
+${PLIST.llvm}lib/ghdl/std/v08/std_standard.o
+${PLIST.llvm}lib/ghdl/std/v08/textio-body.o
+${PLIST.llvm}lib/ghdl/std/v08/textio.o
lib/ghdl/std/v87/std-obj87.cf
-lib/ghdl/std/v87/std_standard.o
-lib/ghdl/std/v87/textio-body.o
-lib/ghdl/std/v87/textio.o
+${PLIST.llvm}lib/ghdl/std/v87/std_standard.o
+${PLIST.llvm}lib/ghdl/std/v87/textio-body.o
+${PLIST.llvm}lib/ghdl/std/v87/textio.o
lib/ghdl/std/v93/std-obj93.cf
-lib/ghdl/std/v93/std_standard.o
-lib/ghdl/std/v93/textio-body.o
-lib/ghdl/std/v93/textio.o
+${PLIST.llvm}lib/ghdl/std/v93/std_standard.o
+${PLIST.llvm}lib/ghdl/std/v93/textio-body.o
+${PLIST.llvm}lib/ghdl/std/v93/textio.o
lib/ghdl/vendors/README.md
lib/ghdl/vendors/compile-altera.ps1
lib/ghdl/vendors/compile-altera.sh
Home |
Main Index |
Thread Index |
Old Index