>From 60375c1391a3d9a42837a9c0ba6404ecfa0ea0a4 Mon Sep 17 00:00:00 2001 From: Marcin Cieslak <sa...@saper.info> Date: Mon, 13 Aug 2012 00:37:42 +0200 Subject: [PATCH] Adjust cpp location for FreeBSD
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. --- cde/config/cf/FreeBSD.cf | 7 +++++++ cde/config/imake/imakemdep.h | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf index d91827c..5e3a00d 100644 --- a/cde/config/cf/FreeBSD.cf +++ b/cde/config/cf/FreeBSD.cf @@ -21,8 +21,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasBSD44Sockets 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 PreProcessCmd /usr/libexec/cpp -traditional +#endif #undef InstallCmd #define InstallCmd /usr/bin/install @@ -58,6 +63,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #define HasMakefileSafeInclude YES #define IncludeMakefile(file) @@# dependencies are in .depend #define DependFileName .depend +#if OSMajorVersion < 3 #if OSMinorVersion < 2 #ifndef ExtraLibraries #define ExtraLibraries -lgnumalloc @@ -66,6 +72,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe #if OSTeenyVersion == 2 #define HasSetUserContext YES #endif +#endif #ifndef ExtraLoadFlags /* * This doesn't work the way it does on every other system. On FreeBSD it's diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h index 2c97383..56f3a0b 100644 --- a/cde/config/imake/imakemdep.h +++ b/cde/config/imake/imakemdep.h @@ -188,6 +188,17 @@ in this Software without prior written authorization from The Open Group. #define imake_ccflags "-DNOSTDHDRS" #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 */ #if defined(__EMX__) #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__)) #define DEFAULT_CPP "/usr/ccs/lib/cpp" #endif -#ifdef __bsdi__ +#if defined(__bsdi__) || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) #define DEFAULT_CPP "/usr/bin/cpp" #endif #ifdef __uxp__ @@ -259,7 +270,8 @@ in this Software without prior written authorization from The Open Group. #ifdef _CRAY #define DEFAULT_CPP "/lib/pcpp" #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" #endif #if defined(__sgi) && defined(__ANSI_CPP__) -- 1.7.9.2 ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ cdesktopenv-devel mailing list cdesktopenv-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
