external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Adjust cpp location for FreeBSD

Browse source 
cpp was removed from /usr/libexec with FreeBSD 5.0-RELEASE.
Use __FreeBSD_version to tell imake if it's still there.

While here, X.Y.Z versioning ended with FreeBSD 3.0, so
we must be dealing with 2.Y.Z when checking for -lgnumalloc.
This commit is contained in:
Marcin Cieslak 2012-08-13 00:37:42 +02:00 • committed by Jon Trulson
parent fa3ad160e4
commit 851330b5f5
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cde/config/cf/FreeBSD.cf
View file

@ -21,8 +21,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasBSD44Sockets YES #define HasBSD44Sockets YES
#define HasZlib YES #define HasZlib YES
#if OSMajorVersion >= 5
#define CppCmd /usr/bin/cpp -traditional
#define PreProcessCmd /usr/bin/cpp -traditional
#else
#define CppCmd /usr/libexec/cpp -traditional #define CppCmd /usr/libexec/cpp -traditional
#define PreProcessCmd /usr/libexec/cpp -traditional #define PreProcessCmd /usr/libexec/cpp -traditional
#endif
#undef InstallCmd #undef InstallCmd
#define InstallCmd /usr/bin/install #define InstallCmd /usr/bin/install
@ -58,6 +63,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasMakefileSafeInclude YES #define HasMakefileSafeInclude YES
#define IncludeMakefile(file) @@# dependencies are in .depend #define IncludeMakefile(file) @@# dependencies are in .depend
#define DependFileName .depend #define DependFileName .depend
#if OSMajorVersion < 3
#if OSMinorVersion < 2 #if OSMinorVersion < 2
#ifndef ExtraLibraries #ifndef ExtraLibraries
#define ExtraLibraries -lgnumalloc #define ExtraLibraries -lgnumalloc
@ -66,6 +72,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#if OSTeenyVersion == 2 #if OSTeenyVersion == 2
#define HasSetUserContext YES #define HasSetUserContext YES
#endif #endif
#endif
#ifndef ExtraLoadFlags #ifndef ExtraLoadFlags
/* /*
* This doesn't work the way it does on every other system. On FreeBSD it's * This doesn't work the way it does on every other system. On FreeBSD it's

16
cde/config/imake/imakemdep.h
View file

@ -188,6 +188,17 @@ in this Software without prior written authorization from The Open Group.
#define imake_ccflags "-DNOSTDHDRS" #define imake_ccflags "-DNOSTDHDRS"
#endif #endif
#ifdef __FreeBSD__
#include <sys/param.h>
#if defined(__FreeBSD_version)
#if __FreeBSD_version < 500000
#define imake_ccflags "-DCPP_IN_LIBEXEC"
#endif
#else
#define imake_ccflags "-DCPP_IN_LIBEXEC"
#endif
#endif
/* this is for OS/2 under EMX. This won't work with DOS */ /* this is for OS/2 under EMX. This won't work with DOS */
#if defined(__EMX__) #if defined(__EMX__)
#define imake_ccflags "-DBSD43" #define imake_ccflags "-DBSD43"
@ -247,7 +258,7 @@ in this Software without prior written authorization from The Open Group.
#if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)) #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__))
#define DEFAULT_CPP "/usr/ccs/lib/cpp" #define DEFAULT_CPP "/usr/ccs/lib/cpp"
#endif #endif
#ifdef __bsdi__ #if defined(__bsdi__) || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC))
#define DEFAULT_CPP "/usr/bin/cpp" #define DEFAULT_CPP "/usr/bin/cpp"
#endif #endif
#ifdef __uxp__ #ifdef __uxp__
@ -259,7 +270,8 @@ in this Software without prior written authorization from The Open Group.
#ifdef _CRAY #ifdef _CRAY
#define DEFAULT_CPP "/lib/pcpp" #define DEFAULT_CPP "/lib/pcpp"
#endif #endif
#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) \
|| (defined(__FreeBSD__) && defined(CPP_IN_LIBEXEC))
#define DEFAULT_CPP "/usr/libexec/cpp" #define DEFAULT_CPP "/usr/libexec/cpp"
#endif #endif
#if defined(__sgi) && defined(__ANSI_CPP__) #if defined(__sgi) && defined(__ANSI_CPP__)