1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

FreeBSD 11: Don't use imported x11/motif, use installed versions for build

With this patch, the import symlinks for x11 and motif do not need to
be created.  The build will use the installed headers in
/usr/local/include/{X11, Xm}.

This will work for FreeBSD 11 only ATM as I don't have older systems
to test with.

It may work for FreeBSD 10 or earlier versions as well.  If so, edit
config/cf/FreeBSD.cf and change the OSMajorVersion check for
UseInstalledX11 appropriately.  And send a patch to the CDE mailing
list :)
This commit is contained in:
Jon Trulson 2018-06-14 00:59:38 +00:00
parent 0554f2335f
commit 396eff69f7
2 changed files with 7 additions and 1 deletions

View file

@ -73,6 +73,12 @@ USE_GCC = UseGcc
# define HasGcc2 YES # define HasGcc2 YES
#endif #endif
/* Use installed X11 includes/libs on FreeBSD 11+ */
#if (OSMajorVersion >= 11)
#define UseInstalledX11 YES
#endif
/* For DtHelp TIFF processing routines. */ /* For DtHelp TIFF processing routines. */
#ifdef AMD64Architecture #ifdef AMD64Architecture
#define LSBBitOrder YES #define LSBBitOrder YES

View file

@ -11,7 +11,7 @@
BOOTSTRAPCFLAGS = BOOTSTRAPCFLAGS =
CC = cc CC = cc
CDEBUGFLAGS = -O CDEBUGFLAGS = -O
INCLUDES = -I../../include -I/usr/include/X11 -I../../imports/x11/include/X11 INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I../../imports/x11/include/X11
CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
SHELL = /bin/sh SHELL = /bin/sh
RM = rm -f RM = rm -f