Changeset 93865


Ignore:
Timestamp:
Jun 1, 2012, 5:36:20 PM (7 years ago)
Author:
jmr@…
Message:

imake: use cpp not $CC -E with clang since it doesn't support -traditional-cpp, and don't change compiler defaults since configure.cpp may be empty and dependents may want a different one anyway

Location:
trunk/dports/x11/imake
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/x11/imake/Portfile

    r92496 r93865  
    66name         imake
    77version      1.0.5
     8revision     1
    89categories   x11 devel
    910license      X11
     
    2425                    sha256 99ce77ce73892d262522ee621032cef2fad2d30a36088b1305a156af4ee21cc1
    2526
    26 patchfiles-append patch-imakemdep.h.diff
    27 
    28 post-patch {
    29     reinplace "s|__MACPORTS_CPP__|${configure.cpp}|g" ${worksrcpath}/imakemdep.h
    30     reinplace "s|__MACPORTS_CC__|${configure.cc}|g"   ${worksrcpath}/imakemdep.h
    31 }
    32 
    3327depends_run    port:xorg-cf-files path:bin/perl:perl5
    3428depends_build  port:pkgconfig port:xorg-xproto
    3529
    36 configure.env-append  HAS_PERL=yes RAWCPP=${configure.cpp}
     30patchfiles     patch-imakemdep.h.diff
     31
     32configure.env  HAS_PERL=yes
    3733
    3834post-configure {
  • trunk/dports/x11/imake/files/patch-imakemdep.h.diff

    r69917 r93865  
    1 --- imakemdep.h.orig    2010-05-02 10:59:14.000000000 -0700
    2 +++ imakemdep.h 2010-05-02 11:00:51.000000000 -0700
    3 @@ -270,8 +270,8 @@
    4  #  if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
    5  
    6  #   if defined(__APPLE__)
    7 -#    define DEFAULT_CPP "/usr/bin/cpp"
    8 -#    define DEFAULT_CC "cc"
    9 +#    define DEFAULT_CPP "__MACPORTS_CPP__"
    10 +#    define DEFAULT_CC "__MACPORTS_CC__"
     1--- imakemdep.h.orig    2012-03-08 16:47:32.000000000 +1100
     2+++ imakemdep.h 2012-06-02 03:24:16.000000000 +1000
     3@@ -339,7 +339,7 @@
     4 #     define DEFAULT_CPP "/usr/X11R6/bin/cpp"
     5 #    endif
    116 #   endif
    12  #   if defined(Lynx) || defined(__Lynx__)
    13  #    define DEFAULT_CC "gcc"
     7-#   if defined(__GNUC__) && !defined(USE_CC_E)
     8+#   if defined(__GNUC__) && !defined(__clang__) && !defined(USE_CC_E)
     9 #    define USE_CC_E
     10 #    ifndef DEFAULT_CC
     11 #     define DEFAULT_CC "gcc"
Note: See TracChangeset for help on using the changeset viewer.