1 |
xarthisius 11/07/12 13:06:07 |
2 |
|
3 |
Added: i3-gentoo.diff |
4 |
Log: |
5 |
Initial import. Ebuild based on extensive work done by Ondrej Sukup (mimi_vx) <mimi.vx@×××××.com> and Andre-Patrick Bubel (moredread) <code@×××××××××××.de> in sunrise overlay. Fixes bug 267476 |
6 |
|
7 |
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-wm/i3/files/i3-gentoo.diff |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/i3/files/i3-gentoo.diff?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/i3/files/i3-gentoo.diff?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: i3-gentoo.diff |
16 |
=================================================================== |
17 |
--- common.mk |
18 |
+++ common.mk |
19 |
@@ -1,5 +1,5 @@ |
20 |
UNAME=$(shell uname) |
21 |
-DEBUG=1 |
22 |
+DEBUG=0 |
23 |
INSTALL=install |
24 |
PREFIX=/usr |
25 |
ifeq ($(PREFIX),/usr) |
26 |
@@ -17,8 +17,7 @@ |
27 |
# We don’t want unused-parameter because of the use of many callbacks |
28 |
CFLAGS += -Wunused-value |
29 |
CFLAGS += -Iinclude |
30 |
-CFLAGS += -I/usr/local/include |
31 |
-CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\" |
32 |
+CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\" |
33 |
|
34 |
# Check if pkg-config is installed, because without pkg-config, the following |
35 |
# check for the version of libxcb cannot be done. |
36 |
@@ -33,27 +32,17 @@ |
37 |
ifeq ($(shell pkg-config --exact-version=0.3.3 xcb-keysyms && echo 1),1) |
38 |
# xcb-keysyms fixed API from 0.3.3 to 0.3.4, so for some months, we will |
39 |
# have this here. Distributions should upgrade their libxcb in the meantime. |
40 |
-CFLAGS += -DOLD_XCB_KEYSYMS_API |
41 |
+CPPFLAGS += -DOLD_XCB_KEYSYMS_API |
42 |
endif |
43 |
|
44 |
-LDFLAGS += -lm |
45 |
-LDFLAGS += -lxcb-keysyms |
46 |
ifeq ($(shell pkg-config --exists xcb-util || echo 1),1) |
47 |
-CFLAGS += -DXCB_COMPAT |
48 |
-LDFLAGS += -lxcb-atom |
49 |
-LDFLAGS += -lxcb-aux |
50 |
-LDFLAGS += -lxcb-event |
51 |
+CPPFLAGS += -DXCB_COMPAT |
52 |
+LIBS += -lxcb-atom -lxcb-aux -lxcb-event |
53 |
else |
54 |
-LDFLAGS += -lxcb-util |
55 |
+LIBS += $(shell pkg-config --libs xcb-util) |
56 |
endif |
57 |
-LDFLAGS += -lxcb-icccm |
58 |
-LDFLAGS += -lxcb-xinerama |
59 |
-LDFLAGS += -lxcb-randr |
60 |
-LDFLAGS += -lxcb |
61 |
-LDFLAGS += -lyajl |
62 |
-LDFLAGS += -lX11 |
63 |
-LDFLAGS += -lev |
64 |
-LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib |
65 |
+LIBS += $(shell pkg-config --libs xcb-keysyms xcb-icccm xcb-xinerama xcb-randr xcb x11) |
66 |
+LIBS += -lyajl -lev -lm |
67 |
|
68 |
ifeq ($(UNAME),NetBSD) |
69 |
# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv |
70 |
@@ -63,12 +52,12 @@ |
71 |
|
72 |
ifeq ($(UNAME),OpenBSD) |
73 |
CFLAGS += -I${X11BASE}/include |
74 |
-LDFLAGS += -liconv |
75 |
+LIBS += -liconv |
76 |
LDFLAGS += -L${X11BASE}/lib |
77 |
endif |
78 |
|
79 |
ifeq ($(UNAME),FreeBSD) |
80 |
-LDFLAGS += -liconv |
81 |
+LIBS += -liconv |
82 |
endif |
83 |
|
84 |
# Fallback for libyajl 1 which did not include yajl_version.h. We need |
85 |
@@ -76,20 +65,15 @@ |
86 |
CFLAGS += -idirafter yajl-fallback |
87 |
|
88 |
ifneq (,$(filter Linux GNU GNU/%, $(UNAME))) |
89 |
-CFLAGS += -D_GNU_SOURCE |
90 |
+CPPFLAGS += -D_GNU_SOURCE |
91 |
endif |
92 |
|
93 |
ifeq ($(DEBUG),1) |
94 |
# Extended debugging flags, macros shall be available in gcc |
95 |
CFLAGS += -gdwarf-2 |
96 |
CFLAGS += -g3 |
97 |
-else |
98 |
-CFLAGS += -O2 |
99 |
endif |
100 |
|
101 |
-# Don’t print command lines which are run |
102 |
-.SILENT: |
103 |
- |
104 |
# Always remake the following targets |
105 |
.PHONY: install clean dist distclean |
106 |
|
107 |
--- Makefile |
108 |
+++ Makefile |
109 |
@@ -20,20 +20,14 @@ |
110 |
|
111 |
# Depend on the specific file (.c for each .o) and on all headers |
112 |
src/%.o: src/%.c ${HEADERS} |
113 |
- echo "CC $<" |
114 |
- $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $< |
115 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $< |
116 |
|
117 |
all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES} |
118 |
- echo "LINK i3" |
119 |
- $(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS) |
120 |
- echo "" |
121 |
- echo "SUBDIR i3-msg" |
122 |
+ $(CC) $(LDFLAGS) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LIBS) |
123 |
$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg |
124 |
- echo "SUBDIR i3-input" |
125 |
$(MAKE) TOPDIR=$(TOPDIR) -C i3-input |
126 |
|
127 |
loglevels.h: |
128 |
- echo "LOGLEVELS" |
129 |
for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \ |
130 |
do \ |
131 |
echo $$(basename $$file .c); \ |
132 |
@@ -45,17 +39,14 @@ |
133 |
echo "};") > include/loglevels.h; |
134 |
|
135 |
src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS} |
136 |
- echo "LEX $<" |
137 |
flex -i -o$(@:.o=.c) $< |
138 |
- $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) |
139 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c) |
140 |
|
141 |
src/cfgparse.y.o: src/cfgparse.y ${HEADERS} |
142 |
- echo "YACC $<" |
143 |
bison --debug --verbose -b $(basename $< .y) -d $< |
144 |
- $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) |
145 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c) |
146 |
|
147 |
install: all |
148 |
- echo "INSTALL" |
149 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin |
150 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3 |
151 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 |
152 |
--- i3-msg/Makefile |
153 |
+++ i3-msg/Makefile |
154 |
@@ -11,15 +11,12 @@ |
155 |
|
156 |
# Depend on the specific file (.c for each .o) and on all headers |
157 |
%.o: %.c ${HEADERS} |
158 |
- echo "CC $<" |
159 |
- $(CC) $(CFLAGS) -c -o $@ $< |
160 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
161 |
|
162 |
all: ${FILES} |
163 |
- echo "LINK i3-msg" |
164 |
- $(CC) -o i3-msg ${FILES} $(LDFLAGS) |
165 |
+ $(CC) $(LDFLAGS) -o i3-msg ${FILES} $(LIBS) |
166 |
|
167 |
install: all |
168 |
- echo "INSTALL" |
169 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin |
170 |
$(INSTALL) -m 0755 i3-msg $(DESTDIR)$(PREFIX)/bin/ |
171 |
|
172 |
--- i3-input/Makefile |
173 |
+++ i3-input/Makefile |
174 |
@@ -9,15 +9,12 @@ |
175 |
|
176 |
# Depend on the specific file (.c for each .o) and on all headers |
177 |
%.o: %.c ${HEADERS} |
178 |
- echo "CC $<" |
179 |
- $(CC) $(CFLAGS) -c -o $@ $< |
180 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
181 |
|
182 |
all: ${FILES} |
183 |
- echo "LINK i3-input" |
184 |
- $(CC) -o i3-input ${FILES} $(LDFLAGS) |
185 |
+ $(CC) $(LDFLAGS) -o i3-input ${FILES} $(LIBS) |
186 |
|
187 |
install: all |
188 |
- echo "INSTALL" |
189 |
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin |
190 |
$(INSTALL) -m 0755 i3-input $(DESTDIR)$(PREFIX)/bin/ |