Jon Trulson <j...@radscan.com> writes: > This also means that Solaris/Sun and NetBSD will no longer build when > I merge the commit. It will be up to the people that maintain/use CDE > for them to send a patch as I do not have those systems available. > > So this is a "heads-up" to them as well. > > Hopefully it should be a simple matter of installing the right package > (and updating the OS wiki page) and adding the correct stanza to > programs/dtdocbook/instant/Imakefile.
OpenIndiana/OpenSolaris build fine (tcl 8.6/8.4), with -ltcl. Users will of course need to install tcl, and also symlink a default version (libtcl.so -> libtcl8.x.so), as I would prefer not to hardcode a dependency on some specific tcl. After some consideration, this patch does not add an architectural condition for Sun. Instead, it sets TCLLIB = -ltcl by default, as all platforms will need *something* there, and that one seems most sensible. I also added an override block, so a user can set overrides in, say, host.def. For example: <host.def> #define TCLInc -I/usr/local/include/tcl8.7 #define TCLLib -ltcl87 -------- This could probably be better. Probably, the defaults should be set in site.def or such; architecture overrides should be in linux.cf, freebsd.cf, etc; and the actual make variables should be defined in some .tmpl file somewhere, as is standard in this codebase. But I'm not sure on all of the specifics, and I think this is still an incremental improvement. These variables will probably soon be obsolete anyway. -mrt
>From 569e419d7c3f7c713cbdfd5ffb89fe5e8b0351f3 Mon Sep 17 00:00:00 2001 From: "Matthew R. Trower" <d...@blackshard.net> Date: Thu, 25 Oct 2018 04:51:52 -0500 Subject: [PATCH] Add default TCLLIB, and allow override in host.def Restores build on Sun, and maybe others. --- cde/programs/dtdocbook/instant/Imakefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtdocbook/instant/Imakefile b/cde/programs/dtdocbook/instant/Imakefile index 0969f10b..75669164 100644 --- a/cde/programs/dtdocbook/instant/Imakefile +++ b/cde/programs/dtdocbook/instant/Imakefile @@ -3,16 +3,23 @@ XCOMM $XConsortium: Imakefile /main/6 1996/11/29 11:06:09 rswiston $ XLATESRC = $(DTSVCSRC)/DtUtil2 TCLINC = -TCLLIB = +TCLLIB = -ltcl #if defined(LinuxArchitecture) TCLINC = -I/usr/include/tcl -TCLLIB = -ltcl #elif defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) TCLINC = -I/usr/local/include/tcl8.6 TCLLIB = -ltcl86 #endif +#if defined(TCLInc) +TCLINC = TCLInc +#endif +#if defined(TCLLib) +TCLLIB = TCLLib +#endif + + INCLUDES = -I../lib/tptregexp -I$(XLATESRC) $(TCLINC) DEPLIBS = $(DEPDTSVCLIB) LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \ -- 2.16.2
_______________________________________________ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
