blob: 5ea43a3d359cdf4e88f6a9a6e29fb7ab62176636 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
require 'formula'
class ImakeXorgCfFiles < Formula
url 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2'
sha1 'c58b7252df481572ec1ccd77b9f1ab561ed89e45'
end
class Imake < Formula
homepage 'http://xorg.freedesktop.org'
url 'http://xorg.freedesktop.org/releases/individual/util/imake-1.0.5.tar.bz2'
sha1 '1fd3dca267d125ad86583d7f9663b6ff532cddd1'
depends_on 'pkg-config' => :build
depends_on :x11
env :std # CPP issues under superenv
def patches
# Remove cpp whitespace check and add "-" to pass the cpp -undef test.
# These are needed to support superenv (which uses clang)
DATA
end
def install
ENV.deparallelize
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
system "make install"
ImakeXorgCfFiles.new.brew do
system "./configure", "--with-config-dir=#{lib}/X11/config"
system "make install"
end
end
end
__END__
diff --git a/configure b/configure
index d4c46f0..4a31a8a 100755
--- a/configure
+++ b/configure
@@ -10581,7 +10581,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
Does cpp redefine unix ?
_ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
+if test `${RAWCPP} - < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
else
@@ -10600,27 +10600,6 @@ $as_echo "yes, with -ansi" >&6; }
fi
rm -f conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5
-$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-Does cpp preserve "whitespace"?
-_ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- as_fn_error $? "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5
- fi
-fi
-rm -f conftest.$ac_ext
-
-
CPP_PROGRAM=${RAWCPP}
|
