Revision: 93825 https://trac.macports.org/changeset/93825 Author: jmr@macports.org Date: 2012-05-31 22:35:19 -0700 (Thu, 31 May 2012) Log Message: ----------- xorg-cf-files: fix or work around compiler issues (#31504) Modified Paths: -------------- trunk/dports/x11/xorg-cf-files/Portfile Added Paths: ----------- trunk/dports/x11/xorg-cf-files/files/ trunk/dports/x11/xorg-cf-files/files/allow-overriding-darwin-compiler.patch trunk/dports/x11/xorg-cf-files/files/empty-char-constant.patch Modified: trunk/dports/x11/xorg-cf-files/Portfile =================================================================== --- trunk/dports/x11/xorg-cf-files/Portfile 2012-06-01 03:40:42 UTC (rev 93824) +++ trunk/dports/x11/xorg-cf-files/Portfile 2012-06-01 05:35:19 UTC (rev 93825) @@ -5,7 +5,7 @@ name xorg-cf-files version 1.0.4 -revision 1 +revision 2 categories x11 devel license X11 platforms darwin @@ -25,20 +25,12 @@ sha1 c58b7252df481572ec1ccd77b9f1ab561ed89e45 \ rmd160 975942e8974812aae91c45d81eb27522e5aa0a5d -# FIXME: clang produces broken darwin.cf file due to lack of configure.cpp. -if {${configure.compiler} == "clang"} { - configure.compiler llvm-gcc-4.2 -} +patchfiles empty-char-constant.patch allow-overriding-darwin-compiler.patch post-configure { #ensure that configuration files are found reinplace "s|#define ConfigDir \$(LIBDIR)/config|#define ConfigDir ${prefix}/lib/X11/config|" ${worksrcpath}/X11.tmpl reinplace "s|#define XAppLoadDir \$(LIBDIR)/app-defaults|#define XAppLoadDir ${prefix}/share/X11/app-defaults|" ${worksrcpath}/X11.tmpl - - #ensure correct compilers are used - reinplace -E s|/usr/bin/cpp\$|${configure.cpp}|g ${worksrcpath}/darwin.cf - reinplace s|/usr/bin/cc|${configure.cc}|g ${worksrcpath}/darwin.cf - reinplace s|/usr/bin/c++|${configure.cxx}|g ${worksrcpath}/darwin.cf } livecheck.type regex Added: trunk/dports/x11/xorg-cf-files/files/allow-overriding-darwin-compiler.patch =================================================================== --- trunk/dports/x11/xorg-cf-files/files/allow-overriding-darwin-compiler.patch (rev 0) +++ trunk/dports/x11/xorg-cf-files/files/allow-overriding-darwin-compiler.patch 2012-06-01 05:35:19 UTC (rev 93825) @@ -0,0 +1,34 @@ +--- darwin.cf.orig 2010-09-04 09:19:43.000000000 +1000 ++++ darwin.cf 2012-06-01 15:29:58.000000000 +1000 +@@ -169,23 +169,31 @@ + * The gcc 3.3 cpp that Apple ships inserts spurious #pragmas, + * so we use the 3.1-based version in this case. + */ ++#ifndef CppCmd + #if (GccMajorVersion == 3) && (GccMinorVersion == 3) + # define CppCmd /usr/bin/cpp3 + #else + # define CppCmd /usr/bin/cpp + #endif ++#endif + #if (GccMajorVersion == 3) && (GccMinorVersion == 3) || (GccMajorVersion > 3) + # define StandardCppOptions -traditional -D__GNUC__ + #endif ++#ifndef RawCppCmd + #if HasGcc3 + # define RawCppCmd CppCmd -undef + #else + # define RawCppCmd CppCmd + #endif ++#endif + + /* we have a gcc compatible compiler, but its not called gcc */ ++#ifndef CcCmd + #define CcCmd /usr/bin/cc ++#endif ++#ifndef CplusplusCmd + #define CplusplusCmd /usr/bin/c++ ++#endif + + /* default flags to pass to cc */ + #ifndef DefaultCCOptions Added: trunk/dports/x11/xorg-cf-files/files/empty-char-constant.patch =================================================================== --- trunk/dports/x11/xorg-cf-files/files/empty-char-constant.patch (rev 0) +++ trunk/dports/x11/xorg-cf-files/files/empty-char-constant.patch 2012-06-01 05:35:19 UTC (rev 93825) @@ -0,0 +1,33 @@ +--- cygwin.cf.orig 2009-10-17 08:45:42.000000000 +1100 ++++ cygwin.cf 2012-06-01 14:32:26.000000000 +1000 +@@ -445,7 +445,7 @@ + * --unix option of Cygwin make fools the standard MakeFlagsToShellFlags macro + */ + #define MakeFlagsToShellFlags(makeflags,shellcmd) \ +- for flag in ${MAKEFLAGS} ''; do \ @@\ ++ for flag in ${MAKEFLAGS} ""; do \ @@\ + case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done + + #define MakeNamedTargetSubdir(dir,flags,subname)\ +--- Imake.rules.orig 2009-10-17 08:45:42.000000000 +1100 ++++ Imake.rules 2012-06-01 14:33:38.000000000 +1000 +@@ -1671,7 +1671,7 @@ + */ + #ifndef MakeFlagsToShellFlags + #define MakeFlagsToShellFlags(makeflags,shellcmd)\ +- for flag in ${MAKEFLAGS} ''; do \ @@\ ++ for flag in ${MAKEFLAGS} ""; do \ @@\ + case "$$flag" in *=*) ;; --*) ;; *[makeflags]*) shellcmd;; esac; done + #endif + +--- mingw.cf.orig 2009-10-17 08:45:42.000000000 +1100 ++++ mingw.cf 2012-06-01 14:33:06.000000000 +1000 +@@ -518,7 +518,7 @@ + * --unix option of Cygwin make fools the standard MakeFlagsToShellFlags macro + */ + #define MakeFlagsToShellFlags(makeflags,shellcmd) \ +- for flag in ${MAKEFLAGS} ''; do \ @@\ ++ for flag in ${MAKEFLAGS} ""; do \ @@\ + case "$$flag" in *=*) ;;--*) ;; *[makeflags]*) shellcmd;; esac; done + + #define MakeNamedTargetSubdir(dir,flags,subname)\