gentoo resync : 21.06.2020

4 files changed, 708 insertions, 0 deletions

diff --git a/dev-perl/Ace/Ace-1.920.0-r5.ebuild b/dev-perl/Ace/Ace-1.920.0-r5.ebuild
new file mode 100644
index 000000000000..8d33aff5d255
--- /dev/null
+++ b/dev-perl/Ace/Ace-1.920.0-r5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_NAME=AcePerl
+DIST_AUTHOR=LDS
+DIST_VERSION=1.92
+DIST_EXAMPLES=("examples/*")
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="Object-Oriented Access to ACEDB Databases"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test ) mirror"
+# License note: Indemnification and Attribution-if-Used bug #718936
+RDEPEND="
+	virtual/perl-Digest-MD5
+	dev-perl/Cache-Cache
+	dev-perl/GD
+"
+DEPEND="
+	elibc_glibc? (  net-libs/libtirpc net-libs/rpcsvc-proto )
+	elibc_musl? (   net-libs/libtirpc net-libs/rpcsvc-proto )
+	elibc_uclibc? ( net-libs/libtirpc net-libs/rpcsvc-proto )
+"
+BDEPEND="
+	${RDEPEND}
+	${DEPEND}
+"
+mydoc="DISCLAIMER.txt"
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.92-rpcxs.patch"
+	eapply "${FILESDIR}/${PN}-1.92-gcc-nonvoid.patch"
+	eapply "${FILESDIR}/${PN}-1.92-toolchain.patch"
+	cp "${FILESDIR}/${PN}-1.92-DARWIN_DEF" "${S}/acelib/wmake/DARWIN_DEF" || die "can't copy DARWIN_DEF"
+	if use elibc_glibc || use elibc_musl || use elibc_uclibc ; then
+		export LIBS="-ltirpc"
+	fi
+	export MAKEOPTS="-j1"
+	perl-module_src_prepare
+}
+src_compile() {
+	mymake=(
+		"AR=$(tc-getAR)"
+		"TARGET_CC=$(tc-getCC)"
+		"TARGET_LD=$(tc-getLD)"
+		"RANLIB=$(tc-getRANLIB)"
+	)
+	if use elibc_glibc || use elibc_musl || use elibc_uclibc ; then
+		mymake+=( "LIBS=-ltirpc -lm" )
+		mymake+=( "USEROPTS=-I/usr/include/tirpc -fPIC" )
+	fi
+	perl-module_src_compile
+}
+
+src_test() {
+	local MODULES=(
+		"Ace ${DIST_VERSION}"
+		"Ace::Freesubs 1.00"
+		"Ace::Graphics::Fk" # NO VERSION
+		"Ace::Graphics::Glyph"
+		"Ace::Graphics::Glyph::anchored_arrow"
+		"Ace::Graphics::Glyph::arrow"
+		"Ace::Graphics::Glyph::box"
+		"Ace::Graphics::Glyph::crossbox"
+		"Ace::Graphics::Glyph::dot"
+		"Ace::Graphics::Glyph::ex"
+		"Ace::Graphics::Glyph::graded_segments"
+		"Ace::Graphics::Glyph::group"
+		"Ace::Graphics::Glyph::line"
+		"Ace::Graphics::Glyph::primers"
+		"Ace::Graphics::Glyph::segments"
+		"Ace::Graphics::Glyph::span"
+		"Ace::Graphics::Glyph::toomany"
+		"Ace::Graphics::Glyph::transcript"
+		"Ace::Graphics::Glyph::triangle"
+		"Ace::Graphics::GlyphFactory"
+		"Ace::Graphics::Panel"
+		"Ace::Graphics::Track"
+		"Ace::Iterator 1.51"
+		"Ace::Local 1.05"
+		"Ace::Model 1.51"
+		"Ace::Object 1.66"
+		"Ace::Object::Wormbase"
+		"Ace::RPC 1.00"
+		"Ace::Sequence 1.51"
+		"Ace::Sequence::Feature"
+		"Ace::Sequence::FeatureList"
+		"Ace::Sequence::GappedAlignment 1.20"
+		"Ace::Sequence::Gene"
+		"Ace::Sequence::Homol"
+		"Ace::Sequence::Multi"
+		"Ace::Sequence::Transcript"
+		"Ace::SocketServer 1.01"
+		"GFF::Filehandle"
+# Need Ace::Browser
+# 		"Ace::Browser::AceSubs ${DIST_VERSION}"
+#		"Ace::Browser::GeneSubs ${DIST_VERSION}"
+#		"Ace::Browser::SearchSubs ${DIST_VERSION}"
+#		"Ace::Browser::SiteDefs ${DIST_VERSION}"
+#		"Ace::Browser::TreeSubs ${DIST_VERSION}"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	if ! has "network" "${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}"; then
+		ewarn "This package needs network access to run its full test suite"
+		ewarn "For details, see:"
+		ewarn "https://wiki.gentoo.org/wiki/Project:Perl/maint-nodes/dev-perl/Ace"
+		ewarn ""
+	else
+		perl-module_src_test
+	fi
+}
+
+pkg_postinst() {
+	ewarn "This package requests that publications that made use of this software"
+	ewarn "in the process of their research attribute it."
+	ewarn ""
+	ewarn "This package's licensing terms also include indemnification clauses"
+	ewarn "which may apply to you, and are currently under decision in"
+	ewarn " Bug: https://bugs.gentoo.org/718936"
+	ewarn ""
+	ewarn "Please read ${EROOT}/usr/share/doc/${PF}/DISCLAIMER.*"
+}
diff --git a/dev-perl/Ace/Manifest b/dev-perl/Ace/Manifest
index 79975d7483b4..b2311b43774f 100644
--- a/dev-perl/Ace/Manifest
+++ b/dev-perl/Ace/Manifest
@@ -1,7 +1,10 @@
+AUX Ace-1.92-DARWIN_DEF 108 BLAKE2B 9c9345fe9a3b8c8fce1a863dfd5fa4d8e81562cb360bb7a31399ec7ef3bb0cae3b01d2b63c57c1eb278db6abd0d551628a1c950baf0d8dff5f372bb83cc187df SHA512 4f45b487d06318e79a134c48d1dc7ad104b1c60721c557299ef7ebe1c6b7191f65cef593fb3a55de186af56124bbec018c3793095a6d46394c146f94012a17c1
 AUX Ace-1.92-gcc-nonvoid.patch 729 BLAKE2B d98d4d2925f8f10f55f64c945ff61509c3ba9fe585432623b97d50eb65ae827ad30e03b653d0e3c2cc7de7bdedff5e312b5383ca303a24c6aa2f5cd95f0bbb81 SHA512 69b2c93de2457aee9908374c475ae2c3aa3e03bcec807abe86ba0a39d28ee41ea2d0a6aaebe99067e50f044933e6b19ea16d1c6e0bd6423b4bb54bf09bf30e90
 AUX Ace-1.92-glibc26.patch 749 BLAKE2B 261d699ab79bb625cf8590c900913ee35363b7cd7a70d3ec82a3866c9e06c33e70f760610b65e2591b1becbff5b58264c61917628cddbd8a2d490ea6c4911e0d SHA512 a383275a27abaf533174395040513dc47355a1c56d660d7221e4142ea90a1ca97957f8fd981476ec62744df7a65037b44ad957467962ce5aa730f2fba916f7d1
 AUX Ace-1.92-rpcxs.patch 819 BLAKE2B 2eb978b7bbced6b67976685d8102724f6357983459e90a14fdab1cb696a8e8c033093d3427cf7aec820aa27eb0f71c9d505962dc2aa62ca67455562b869a5179 SHA512 ae26f67a5a0b91652c90dbb4beea7553e3affc40a15db52247ba28e4171f150c4ffa70ce15b69ce3735176c810b36105b00fb5675f4320340354a929568b49d9
+AUX Ace-1.92-toolchain.patch 18838 BLAKE2B 1ad84efcf6751c1f1fdca059b1747fdf7da4d08c3c40128ef00b0ec2b4eca208f9825f94f273524fe1145c39cb58e01f9b8c7e90bb349efe6531111e9eeba74b SHA512 12aa40d1b50fa780b44ed72fbc2a56d091c2bdec87bed674f388669a180dc5d474a9efa9380327ee8592e75739800ab17ea2535849e1468242572e2db9ad19ad
 DIST AcePerl-1.92.tar.gz 300163 BLAKE2B 4fac4d7f56d31f179a1a310688cde078371a1e6605b229016a5a2f3a32de01bf3421c459eeefcdfdd12df3baf34d6495c8e7998e1c66a47215ea2abd741303b6 SHA512 0db8392336dd48c58bdaf8d8d9ac6d1106124259f27fa95951aa8d496014e1e8b89ed87f6df276473e3bcb44a8d323f864178a9b84dd1e787d614bd0b8e93be9
 EBUILD Ace-1.920.0-r3.ebuild 2952 BLAKE2B 3f7072080cdf6a51cbe128218067e4e597e5194161dab73ef48fafbf617bb2e84030c3abd4c8c6388584edfc80537c70ea69b493565af9e46fa191cbd2b8310c SHA512 52a373997f6591d21ba240176b136c7fe43819ad3e400cbe3264ea87d4beb154cd3a68047e43b22dad8953271cbe5d53d21630be2ae142535fbdae69dd285085
 EBUILD Ace-1.920.0-r4.ebuild 3734 BLAKE2B e16fd27affa775ce65ae401c804ba28209965555e03149ab3d86ed43d2331807736094ee6db057909dc6598e9b4b34d97ed32fd03b40b67ee1b0cdfdfc003f2e SHA512 9eeeb8e0d0c477a97d12cb91de66c01b204ed3851f8ef9e5dd9baf8a261a296d4c56c8b2c716f0257f2f1e1403189f785eb89aefb7414f66f2993de7664f0e1f
+EBUILD Ace-1.920.0-r5.ebuild 3928 BLAKE2B d982337f484eaf1c393f2afc1cd5088c7d4f2dcb424a21467e89e75dae17ed9b68f8cabfd6958c0ce61227b36f96872b976f9a811090b6e2c0aed8cb77c2ef25 SHA512 6916ba127d91cb0131835ce6d92df6d516121d24fe5acabb412ea1adf7145915a7defe92500fe2c11fccc0271db542d8167a6542616848c0f844879ca0de02f5
 MISC metadata.xml 3416 BLAKE2B 4385d220ac60f2e41750bb1afeff4f9a9055526710db08c2688f1e3787a17f2d9943af22825c8ec554c832f2a428410578baf25044348cbc984114890adcc770 SHA512 aa3443c187165f3cf97e7110238cb039242345071f9e3f74ed40e39a9ce0720062706dd78539eff1553703ed5e8cf55d42b924ebae3cc992366358d300ec544d
diff --git a/dev-perl/Ace/files/Ace-1.92-DARWIN_DEF b/dev-perl/Ace/files/Ace-1.92-DARWIN_DEF
new file mode 100644
index 000000000000..5e4462e4070a
--- /dev/null
+++ b/dev-perl/Ace/files/Ace-1.92-DARWIN_DEF
@@ -0,0 +1,5 @@
+NAME = DARWIN
+COMPILER = $(TARGET_CC) -fwritable-strings -DACEDB4 -DPOSIX
+LINKER = $(TARGET_LD)
+
+LIBS = -lm
diff --git a/dev-perl/Ace/files/Ace-1.92-toolchain.patch b/dev-perl/Ace/files/Ace-1.92-toolchain.patch
new file mode 100644
index 000000000000..91c1473d62d9
--- /dev/null
+++ b/dev-perl/Ace/files/Ace-1.92-toolchain.patch
@@ -0,0 +1,561 @@
+From d1f8c174bf1d893259eac9f30c49edb1a062525f Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Mon, 18 May 2020 06:52:59 +1200
+Subject: Make overriding AR/CC/RANLIB possible generically
+
+---
+ acelib/Makefile                      | 20 ++++++++++++--------
+ acelib/wmake/ALPHA_4_DEF             |  4 ++--
+ acelib/wmake/ALPHA_4_GCC_DEF         |  4 ++--
+ acelib/wmake/ALPHA_4_NEW_DEF         |  4 ++--
+ acelib/wmake/ALPHA_4_OPT_DEF         |  4 ++--
+ acelib/wmake/ALPHA_4_OSFV3_DEF       |  4 ++--
+ acelib/wmake/ALPHA_CHRONO_4_DEF      |  4 ++--
+ acelib/wmake/ALPHA_G3_DEF            |  4 ++--
+ acelib/wmake/DEC_OSF_DEF             |  4 ++--
+ acelib/wmake/HPUX_DEF                |  4 ++--
+ acelib/wmake/HP_4_GCC_DEF            |  4 ++--
+ acelib/wmake/INTEL_SOLARIS_4_OPT_DEF |  4 ++--
+ acelib/wmake/IRIX4_4_DEF             |  4 ++--
+ acelib/wmake/IRIX_DEF                |  4 ++--
+ acelib/wmake/LINUX_4_DEF             |  4 ++--
+ acelib/wmake/LINUX_DEF               |  4 ++--
+ acelib/wmake/LINUX_LIBC5_4_DEF       |  4 ++--
+ acelib/wmake/LINUX_MAC_4_DEF         |  4 ++--
+ acelib/wmake/POSIX_4_DEF             |  4 ++--
+ acelib/wmake/POSIX_4_GCC_DEF         |  4 ++--
+ acelib/wmake/SGI_4_DEF               |  4 ++--
+ acelib/wmake/SGI_4_GCC_DEF           |  4 ++--
+ acelib/wmake/SGI_4_IRIX5_DEF         |  4 ++--
+ acelib/wmake/SGI_4_NEW_DEF           |  4 ++--
+ acelib/wmake/SGI_4_PURE_DEF          |  4 ++--
+ acelib/wmake/SGI_DEF                 |  4 ++--
+ acelib/wmake/SOLARIS_4_DEF           |  4 ++--
+ acelib/wmake/SOLARIS_4_NEW_DEF       |  4 ++--
+ acelib/wmake/SOLARIS_4_OPT_DEF       |  4 ++--
+ acelib/wmake/SOLARIS_4_RELEASE_DEF   |  4 ++--
+ acelib/wmake/SOLARIS_7_gcc_DEF       |  4 ++--
+ acelib/wmake/SOLARIS_DEF             |  4 ++--
+ acelib/wmake/SOLARIS_GCC_DEF         |  4 ++--
+ acelib/wmake/SUNOS_DEF               |  4 ++--
+ acelib/wmake/SUN_4_DEF               |  4 ++--
+ acelib/wmake/SUN_4_NEW_DEF           |  4 ++--
+ 36 files changed, 82 insertions(+), 78 deletions(-)
+
+diff --git a/acelib/Makefile b/acelib/Makefile
+index 946167f..1bb71ca 100644
+--- a/acelib/Makefile
++++ b/acelib/Makefile
+@@ -3,4 +3,8 @@ false = 0
+ RANLIB_NEEDED = true	# default overridable in $(ACEDB_MACHINE)_DEF
+ AR_OPTIONS = rlu	# default overridable in $(ACEDB_MACHINE)_DEF
++AR = ar
++RANLIB = ranlib
++TARGET_CC = cc
++TARGET_LD = cc # stuff expects ld to be a CCLD in perl
+ 
+ RPCGEN_FLAGS = -I -K -1
+@@ -64,10 +68,10 @@ depend:
+ 
+ libaceperl.a : $(FREE_OBJS) aceclientlib.o rpcace_clnt.o rpcace_xdr.o
+-	ar $(AR_OPTIONS) $@ $?
+-	if ( $(RANLIB_NEEDED) ) then ranlib $@; fi
++	$(AR) $(AR_OPTIONS) $@ $?
++	if ( $(RANLIB_NEEDED) ) then $(RANLIB) $@; fi
+ 
+ libfree.a : $(FREE_OBJS)
+-	ar $(AR_OPTIONS) libfree.a $?
+-	if ( $(RANLIB_NEEDED) ) then ranlib libfree.a; fi
++	$(AR) $(AR_OPTIONS) libfree.a $?
++	if ( $(RANLIB_NEEDED) ) then $(RANLIB) libfree.a; fi
+ 
+ #########################################
+@@ -88,6 +92,6 @@ LIBACE_OBJS = $(GENERIC_ACE_OBJS) $(GENERIC_ACE_NONGRAPH_OBJS) aceversion.o
+ 
+ libace.a :  $(LIBACE_OBJS)
+-	ar $(AR_OPTIONS) libace.a $?
+-	if ( $(RANLIB_NEEDED) ) then ranlib libace.a; fi
++	$(AR) $(AR_OPTIONS) libace.a $?
++	if ( $(RANLIB_NEEDED) ) then $(RANLIB) libace.a; fi
+ 
+ ######################################################
+@@ -111,6 +115,6 @@ RPC_X_CLIENT_OBJS = xclient.o aceclientlib.o rpcace_clnt.o rpcace_xdr.o
+ 
+ libacecl.a : aceclientlib.o rpcace_clnt.o rpcace_xdr.o
+-	ar $(AR_OPTIONS) libacecl.a $?
+-	if ( $(RANLIB_NEEDED) ) then ranlib libacecl.a; fi
++	$(AR) $(AR_OPTIONS) libacecl.a $?
++	if ( $(RANLIB_NEEDED) ) then $(RANLIB) libacecl.a; fi
+ 
+ ###########################################################
+diff --git a/acelib/wmake/ALPHA_4_DEF b/acelib/wmake/ALPHA_4_DEF
+index 5d439f4..96cb6c1 100644
+--- a/acelib/wmake/ALPHA_4_DEF
++++ b/acelib/wmake/ALPHA_4_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = ALPHA
+-COMPILER = cc -g -std1 -ieee_with_inexact -DACEDB4
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -g -std1 -ieee_with_inexact -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ # On DEC the library does not need to be ranlib'd
+diff --git a/acelib/wmake/ALPHA_4_GCC_DEF b/acelib/wmake/ALPHA_4_GCC_DEF
+index 9b13569..a517e3d 100644
+--- a/acelib/wmake/ALPHA_4_GCC_DEF
++++ b/acelib/wmake/ALPHA_4_GCC_DEF
+@@ -15,7 +15,7 @@
+ 
+ NAME = ALPHA
+-COMPILER = gcc -g -DACEDB4 -ansi -pedantic -Wall -Wnested-externs -ieee_with_inexact
++COMPILER = $(TARGET_CC) -g -DACEDB4 -ansi -pedantic -Wall -Wnested-externs -ieee_with_inexact
+ 
+-LINKER = gcc -g
++LINKER = $(TARGET_LD) -g
+ 
+ # On DEC the library does not need to be ranlib'd
+diff --git a/acelib/wmake/ALPHA_4_NEW_DEF b/acelib/wmake/ALPHA_4_NEW_DEF
+index 012f167..8843b14 100644
+--- a/acelib/wmake/ALPHA_4_NEW_DEF
++++ b/acelib/wmake/ALPHA_4_NEW_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = ALPHA
+-COMPILER = cc -g -std1 -DACEDB4 -DNEW_MODELS
+-LINKER = cc
++COMPILER = $(TARGET_CC) -g -std1 -DACEDB4 -DNEW_MODELS
++LINKER = $(TARGET_LD)
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/ALPHA_4_OPT_DEF b/acelib/wmake/ALPHA_4_OPT_DEF
+index 8ebd39f..3fe63d7 100644
+--- a/acelib/wmake/ALPHA_4_OPT_DEF
++++ b/acelib/wmake/ALPHA_4_OPT_DEF
+@@ -16,10 +16,10 @@
+ 
+ NAME = ALPHA
+-COMPILER = cc -O -Olimit 3000 -std1 -DACEDB4 -ieee_with_inexact
++COMPILER = $(TARGET_CC) -O -Olimit 3000 -std1 -DACEDB4 -ieee_with_inexact
+ 
+ # rd 970131 - I am told that -O does the most optimisation possible
+ # there may be levels above -O2
+ 
+-LINKER = cc
++LINKER = $(TARGET_LD)
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/ALPHA_4_OSFV3_DEF b/acelib/wmake/ALPHA_4_OSFV3_DEF
+index d34390e..81eb594 100644
+--- a/acelib/wmake/ALPHA_4_OSFV3_DEF
++++ b/acelib/wmake/ALPHA_4_OSFV3_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = ALPHA
+-COMPILER = cc -g -std1 -ieee_with_inexact -DACEDB4
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -g -std1 -ieee_with_inexact -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/ALPHA_CHRONO_4_DEF b/acelib/wmake/ALPHA_CHRONO_4_DEF
+index 011c7d2..004bdca 100644
+--- a/acelib/wmake/ALPHA_CHRONO_4_DEF
++++ b/acelib/wmake/ALPHA_CHRONO_4_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = ALPHA
+-COMPILER = cc -g -std1 -DACEDB4 -DCHRONO
+-LINKER = cc
++COMPILER = $(TARGET_CC) -g -std1 -DACEDB4 -DCHRONO
++LINKER = $(TARGET_LD)
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/ALPHA_G3_DEF b/acelib/wmake/ALPHA_G3_DEF
+index b259de0..1a3ed6f 100644
+--- a/acelib/wmake/ALPHA_G3_DEF
++++ b/acelib/wmake/ALPHA_G3_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = ALPHA
+-COMPILER = gcc -g -DACEDB3
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -DACEDB3
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/DEC_OSF_DEF b/acelib/wmake/DEC_OSF_DEF
+index fddfef9..6e4c397 100644
+--- a/acelib/wmake/DEC_OSF_DEF
++++ b/acelib/wmake/DEC_OSF_DEF
+@@ -16,10 +16,10 @@
+ 
+ NAME = ALPHA
+-COMPILER = cc -O -Olimit 3000 -std1 -DACEDB4 -ieee_with_inexact
++COMPILER = $(TARGET_CC) -O -Olimit 3000 -std1 -DACEDB4 -ieee_with_inexact
+ 
+ # rd 970131 - I am told that -O does the most optimisation possible
+ # there may be levels above -O2
+ 
+-LINKER = cc
++LINKER = $(TARGET_LD)
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/HPUX_DEF b/acelib/wmake/HPUX_DEF
+index e7a08d5..0a73497 100644
+--- a/acelib/wmake/HPUX_DEF
++++ b/acelib/wmake/HPUX_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = HP
+-COMPILER = gcc -g -DNO_LEFT_CASTING -DACEDB4 -I/usr/include/X11R5 -I/usr/local/include/MIT/X11R5/include
+-LINKER = gcc -g -L/usr/lib/X11R5
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4 -I/usr/include/X11R5 -I/usr/local/include/MIT/X11R5/include
++LINKER = $(TARGET_LD) -g -L/usr/lib/X11R5
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/HP_4_GCC_DEF b/acelib/wmake/HP_4_GCC_DEF
+index 87f3bf1..90459b2 100644
+--- a/acelib/wmake/HP_4_GCC_DEF
++++ b/acelib/wmake/HP_4_GCC_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = HP
+-COMPILER = gcc -g -DNO_LEFT_CASTING -DACEDB4 -I/usr/include/X11R5 -I/usr/local/include/MIT/X11R5/include
+-LINKER = gcc -g -L/usr/lib/X11R5
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4 -I/usr/include/X11R5 -I/usr/local/include/MIT/X11R5/include
++LINKER = $(TARGET_LD) -g -L/usr/lib/X11R5
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/INTEL_SOLARIS_4_OPT_DEF b/acelib/wmake/INTEL_SOLARIS_4_OPT_DEF
+index 390be89..43ebfd5 100644
+--- a/acelib/wmake/INTEL_SOLARIS_4_OPT_DEF
++++ b/acelib/wmake/INTEL_SOLARIS_4_OPT_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = INTEL_SOLARIS
+-COMPILER = cc -xO4 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -L/usr/openwin/lib -R/usr/openwin/lib
++COMPILER = $(TARGET_CC) -xO4 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -L/usr/openwin/lib -R/usr/openwin/lib
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/IRIX4_4_DEF b/acelib/wmake/IRIX4_4_DEF
+index cef3a2d..53c1214 100644
+--- a/acelib/wmake/IRIX4_4_DEF
++++ b/acelib/wmake/IRIX4_4_DEF
+@@ -19,7 +19,7 @@
+ 
+ NAME = SGI 
+-COMPILER = cc -g -DNO_LEFT_CASTING -DACEDB4 -Wf,-XNl4096
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4 -Wf,-XNl4096
+ # -Wf,-XNl4096 needed to compile big string constant in graphxt.c
+-LINKER = cc -g
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm  -lsun
+diff --git a/acelib/wmake/IRIX_DEF b/acelib/wmake/IRIX_DEF
+index 8bec470..a177b0a 100644
+--- a/acelib/wmake/IRIX_DEF
++++ b/acelib/wmake/IRIX_DEF
+@@ -15,6 +15,6 @@
+ 
+ NAME = SGI 
+-COMPILER = cc -g -n32 DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -g -n32 DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/LINUX_4_DEF b/acelib/wmake/LINUX_4_DEF
+index 12fa675..88f2d7e 100644
+--- a/acelib/wmake/LINUX_4_DEF
++++ b/acelib/wmake/LINUX_4_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = LINUX
+-COMPILER = gcc -g -Wall -O2 -DACEDB4
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -Wall -O2 -DACEDB4
++LINKER = $(TARGET_LD) -g
+ USEROPTS=-fPIC
+ 
+diff --git a/acelib/wmake/LINUX_DEF b/acelib/wmake/LINUX_DEF
+index ba96774..51221ef 100644
+--- a/acelib/wmake/LINUX_DEF
++++ b/acelib/wmake/LINUX_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = LINUX
+-COMPILER = gcc -g -Wall -O2 -DACEDB4
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -Wall -O2 -DACEDB4
++LINKER = $(TARGET_LD) -g
+ USEROPTS=-fPIC
+ 
+diff --git a/acelib/wmake/LINUX_LIBC5_4_DEF b/acelib/wmake/LINUX_LIBC5_4_DEF
+index 8d59cbf..ba01857 100644
+--- a/acelib/wmake/LINUX_LIBC5_4_DEF
++++ b/acelib/wmake/LINUX_LIBC5_4_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = LINUX
+-COMPILER = gcc -g -fwritable-strings -DACEDB4 -I.
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -fwritable-strings -DACEDB4 -I.
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/LINUX_MAC_4_DEF b/acelib/wmake/LINUX_MAC_4_DEF
+index 75a0c49..e043ac0 100644
+--- a/acelib/wmake/LINUX_MAC_4_DEF
++++ b/acelib/wmake/LINUX_MAC_4_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = LINUX
+-COMPILER = gcc -g -fwritable-strings -DACEDB4 -I. -DLINUX_MAC
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -fwritable-strings -DACEDB4 -I. -DLINUX_MAC
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/POSIX_4_DEF b/acelib/wmake/POSIX_4_DEF
+index 71173a8..cb9d938 100644
+--- a/acelib/wmake/POSIX_4_DEF
++++ b/acelib/wmake/POSIX_4_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = POSIX
+-COMPILER = cc -DACEDB4
+-LINKER = cc
++COMPILER = $(TARGET_CC) -DACEDB4
++LINKER = $(TARGET_LD)
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/POSIX_4_GCC_DEF b/acelib/wmake/POSIX_4_GCC_DEF
+index 07ff235..612c920 100644
+--- a/acelib/wmake/POSIX_4_GCC_DEF
++++ b/acelib/wmake/POSIX_4_GCC_DEF
+@@ -17,6 +17,6 @@
+ 
+ NAME = POSIX
+-COMPILER = gcc -fwritable-strings -DACEDB4
+-LINKER = gcc
++COMPILER = $(TARGET_CC) -fwritable-strings -DACEDB4
++LINKER = $(TARGET_LD)
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/SGI_4_DEF b/acelib/wmake/SGI_4_DEF
+index e5e8e92..909c92b 100644
+--- a/acelib/wmake/SGI_4_DEF
++++ b/acelib/wmake/SGI_4_DEF
+@@ -18,6 +18,6 @@
+ #
+ NAME = SGI 
+-COMPILER = cc -g -DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/SGI_4_GCC_DEF b/acelib/wmake/SGI_4_GCC_DEF
+index 47b3b22..41d2418 100644
+--- a/acelib/wmake/SGI_4_GCC_DEF
++++ b/acelib/wmake/SGI_4_GCC_DEF
+@@ -15,6 +15,6 @@
+ 
+ NAME = SGI 
+-COMPILER = gcc -g -DNO_LEFT_CASTING -Wall -DACEDB4
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -Wall -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm 
+diff --git a/acelib/wmake/SGI_4_IRIX5_DEF b/acelib/wmake/SGI_4_IRIX5_DEF
+index 072e0ce..1515ca2 100644
+--- a/acelib/wmake/SGI_4_IRIX5_DEF
++++ b/acelib/wmake/SGI_4_IRIX5_DEF
+@@ -15,6 +15,6 @@
+ 
+ NAME = SGI 
+-COMPILER = cc -g -DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/SGI_4_NEW_DEF b/acelib/wmake/SGI_4_NEW_DEF
+index b4938f2..f4f96e2 100644
+--- a/acelib/wmake/SGI_4_NEW_DEF
++++ b/acelib/wmake/SGI_4_NEW_DEF
+@@ -19,6 +19,6 @@
+ 
+ NAME = SGI 
+-COMPILER = cc -Wf,-XNh2000 -g -DNO_LEFT_CASTING -DACEDB4 -DNEW_MODELS -I.
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -Wf,-XNh2000 -g -DNO_LEFT_CASTING -DACEDB4 -DNEW_MODELS -I.
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm  -lsun
+diff --git a/acelib/wmake/SGI_4_PURE_DEF b/acelib/wmake/SGI_4_PURE_DEF
+index d9f4af3..f2150e4 100644
+--- a/acelib/wmake/SGI_4_PURE_DEF
++++ b/acelib/wmake/SGI_4_PURE_DEF
+@@ -18,6 +18,6 @@
+ #
+ NAME = SGI 
+-COMPILER = cc -g -DNO_LEFT_CASTING -DACEDB4
+-LINKER = purify -chain-length="10" cc -g
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4
++LINKER = purify -chain-length="10" $(TARGET_LD) -g
+ 
+ #different c++ compiler for purify compiling
+diff --git a/acelib/wmake/SGI_DEF b/acelib/wmake/SGI_DEF
+index 0db7af5..1571f5a 100644
+--- a/acelib/wmake/SGI_DEF
++++ b/acelib/wmake/SGI_DEF
+@@ -18,6 +18,6 @@
+ #
+ NAME = SGI 
+-COMPILER = cc -g -DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -g
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ LIBS = -lm
+diff --git a/acelib/wmake/SOLARIS_4_DEF b/acelib/wmake/SOLARIS_4_DEF
+index fbe8238..423b3c3 100644
+--- a/acelib/wmake/SOLARIS_4_DEF
++++ b/acelib/wmake/SOLARIS_4_DEF
+@@ -15,6 +15,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = gcc -g -DNO_LEFT_CASTING -O2 -Wall -I/usr/openwin/include -DACEDB4
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -DNO_LEFT_CASTING -O2 -Wall -I/usr/openwin/include -DACEDB4
++LINKER = $(TARGET_LD) -g
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SOLARIS_4_NEW_DEF b/acelib/wmake/SOLARIS_4_NEW_DEF
+index 518831f..82f9409 100644
+--- a/acelib/wmake/SOLARIS_4_NEW_DEF
++++ b/acelib/wmake/SOLARIS_4_NEW_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = gcc -g -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4 -DNEW_MODELS -I.
+-LINKER = gcc -g
++COMPILER = $(TARGET_CC) -g -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4 -DNEW_MODELS -I.
++LINKER = $(TARGET_LD) -g
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SOLARIS_4_OPT_DEF b/acelib/wmake/SOLARIS_4_OPT_DEF
+index 3f0c604..c938b9b 100644
+--- a/acelib/wmake/SOLARIS_4_OPT_DEF
++++ b/acelib/wmake/SOLARIS_4_OPT_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = cc -xO4 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -L/usr/openwin/lib -R/usr/openwin/lib
++COMPILER = $(TARGET_CC) -xO4 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -L/usr/openwin/lib -R/usr/openwin/lib
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SOLARIS_4_RELEASE_DEF b/acelib/wmake/SOLARIS_4_RELEASE_DEF
+index cd8063f..287836f 100644
+--- a/acelib/wmake/SOLARIS_4_RELEASE_DEF
++++ b/acelib/wmake/SOLARIS_4_RELEASE_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = gcc -g -O2 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4 -I.
+-LINKER = gcc -g -Xlinker -R -Xlinker /usr/openwin/lib -L/usr/openwin/lib
++COMPILER = $(TARGET_CC) -g -O2 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4 -I.
++LINKER = $(TARGET_LD) -g -Xlinker -R -Xlinker /usr/openwin/lib -L/usr/openwin/lib
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SOLARIS_7_gcc_DEF b/acelib/wmake/SOLARIS_7_gcc_DEF
+index 63a538e..5964609 100644
+--- a/acelib/wmake/SOLARIS_7_gcc_DEF
++++ b/acelib/wmake/SOLARIS_7_gcc_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = gcc -O4 -fwritable-strings -I/usr/openwin/include -DACEDB4 -DHASVSPRINTF
+-LINKER = gcc -L/usr/openwin/lib -R/usr/openwin/lib
++COMPILER = $(TARGET_CC) -O4 -fwritable-strings -I/usr/openwin/include -DACEDB4 -DHASVSPRINTF
++LINKER = $(TARGET_LD) -L/usr/openwin/lib -R/usr/openwin/lib
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SOLARIS_DEF b/acelib/wmake/SOLARIS_DEF
+index 8f7ce2b..048d219 100644
+--- a/acelib/wmake/SOLARIS_DEF
++++ b/acelib/wmake/SOLARIS_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = cc -O2 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
+-LINKER = cc -L/usr/openwin/lib -R/usr/openwin/lib
++COMPILER = $(TARGET_CC) -O2 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -L/usr/openwin/lib -R/usr/openwin/lib
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SOLARIS_GCC_DEF b/acelib/wmake/SOLARIS_GCC_DEF
+index 16c9334..048d219 100644
+--- a/acelib/wmake/SOLARIS_GCC_DEF
++++ b/acelib/wmake/SOLARIS_GCC_DEF
+@@ -16,6 +16,6 @@
+ 
+ NAME = SOLARIS
+-COMPILER = gcc -O2 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
+-LINKER = gcc -L/usr/openwin/lib -R/usr/openwin/lib
++COMPILER = $(TARGET_CC) -O2 -I/usr/openwin/include -DNO_LEFT_CASTING -DACEDB4
++LINKER = $(TARGET_LD) -L/usr/openwin/lib -R/usr/openwin/lib
+ 
+ # -DWCS causes a problem, class versus Xlib.h
+diff --git a/acelib/wmake/SUNOS_DEF b/acelib/wmake/SUNOS_DEF
+index bef6180..d159952 100644
+--- a/acelib/wmake/SUNOS_DEF
++++ b/acelib/wmake/SUNOS_DEF
+@@ -23,7 +23,7 @@ NAME = SUN
+ 
+ ## NOMEMMOVE will define memmove on SunOS (for staden package)
+-COMPILER = gcc -g -O2 -Wall -fwritable-strings -DNOMEMMOVE -DACEDB4
++COMPILER = $(TARGET_CC) -g -O2 -Wall -fwritable-strings -DNOMEMMOVE -DACEDB4
+ 
+-LINKER = gcc -g -static 
++LINKER = $(TARGET_LD) -g -static 
+ 
+ #LIBS = -lm -L/usr/lib -L/usr/openwin.old/lib -L/usr/X11R6.3/lib
+diff --git a/acelib/wmake/SUN_4_DEF b/acelib/wmake/SUN_4_DEF
+index e1fdad1..88418d5 100644
+--- a/acelib/wmake/SUN_4_DEF
++++ b/acelib/wmake/SUN_4_DEF
+@@ -23,7 +23,7 @@ NAME = SUN
+ 
+ ## NOMEMMOVE will define memmove on SunOS (for staden package)
+-COMPILER = gcc -g -O2 -Wall -fwritable-strings -DNOMEMMOVE -DACEDB4
++COMPILER = $(TARGET_CC) -g -O2 -Wall -fwritable-strings -DNOMEMMOVE -DACEDB4
+ 
+-LINKER = gcc -g -static 
++LINKER = $(TARGET_LD) -g -static 
+ 
+ #LIBS = -lm -L/usr/lib -L/usr/openwin.old/lib -L/usr/X11R6.3/lib
+diff --git a/acelib/wmake/SUN_4_NEW_DEF b/acelib/wmake/SUN_4_NEW_DEF
+index 32685ef..0f5b8ce 100644
+--- a/acelib/wmake/SUN_4_NEW_DEF
++++ b/acelib/wmake/SUN_4_NEW_DEF
+@@ -16,7 +16,7 @@
+ 
+ NAME = SUN
+-COMPILER = gcc -g -Wreturn-type -Wimplicit -Wunused -Wcomment \
++COMPILER = $(TARGET_CC) -g -Wreturn-type -Wimplicit -Wunused -Wcomment \
+ 	-fwritable-strings -DACEDB4 -DNEW_MODELS
+-LINKER = gcc -g -static
++LINKER = $(TARGET_LD) -g -static
+ 
+ LIBS = -lm
+-- 
+2.26.2
+