/[gentoo-x86]/net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch
Gentoo

Contents of /net-misc/stargazer/files/patches/stg-2.408-makefile-build-upstream.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download) (as text)
Sat Feb 23 20:13:30 2013 UTC (7 years, 1 month ago) by tomwij
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
New ebuild for stargazer. Contributed by SpiderX. Fixes bug #452916.

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

1 tomwij 1.1 diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile
2     index efacbb6..04c00cc 100644
3     --- a/projects/sgconv/Makefile
4     +++ b/projects/sgconv/Makefile
5     @@ -58,6 +58,21 @@ clean:
6     distclean: clean
7     rm -f ../../Makefile.conf
8    
9     +install: install-bin
10     +
11     +install-bin:
12     +ifeq ($(DEBUG), yes)
13     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
14     +else
15     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
16     +endif
17     + $(MAKE) -C $(DIR_PLUGINS) install
18     +
19     +uninstall: uninstall-bin
20     +
21     +uninstall-bin:
22     + rm -f $(PREFIX)/usr/bin/$(PROG)
23     +
24     ifneq ($(MAKECMDGOALS),distclean)
25     ifneq ($(MAKECMDGOALS),clean)
26     ifneq ($(MAKECMDGOALS),uninstall)
27     diff --git a/projects/convertor/build b/projects/convertor/build
28     index 0144b0f..471ee62 100755
29     --- a/projects/sgconv/build
30     +++ b/projects/sgconv/build
31     @@ -20,6 +20,7 @@ DEFS="-DDEBUG"
32     MAKEOPTS="-j1"
33     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include"
34     LDFLAGS="$LDFLAGS -L/usr/local/lib"
35     +DEBUG="yes"
36    
37     if [ "$sys" = "Linux" ]
38     then
39     @@ -251,6 +252,7 @@ fi
40    
41     echo "OS=$OS" > $CONFFILE
42     echo "STG_TIME=yes" >> $CONFFILE
43     +echo "DEBUG=$DEBUG" >> $CONFFILE
44     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
45     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
46     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
47     diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile
48     index 98f5f2d..6190491 100644
49     --- a/projects/rlm_stg/Makefile
50     +++ b/projects/rlm_stg/Makefile
51     @@ -57,13 +57,17 @@ distclean: clean
52     install: install-bin
53    
54     install-bin:
55     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG)
56     +ifeq ($(DEBUG), yes)
57     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
58     +else
59     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/freeradius/$(PROG)
60     +endif
61     $(MAKE) -C $(DIR_LIBSRC) install
62    
63     uninstall: uninstall-bin
64    
65     uninstall-bin:
66     - rm -f $(PREFIX)/usr/lib/$(PROG)
67     + rm -f $(PREFIX)/usr/lib/freeradius/$(PROG)
68    
69     ifneq ($(MAKECMDGOALS),distclean)
70     ifneq ($(MAKECMDGOALS),clean)
71     diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build
72     index 0145d03..3781d1b 100755
73     --- a/projects/rlm_stg/build
74     +++ b/projects/rlm_stg/build
75     @@ -19,14 +19,17 @@ OWNER=root
76     if [ -z $1 ]
77     then
78     MAKEOPTS="-j1"
79     + DEBUG="no"
80     else
81     if [ "$1" = "debug" ]
82     then
83     DEFS="-DDEBUG"
84     MAKEOPTS="-j1"
85     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
86     + DEBUG="yes"
87     else
88     MAKEOPTS="-j1"
89     + DEBUG="no"
90     fi
91     fi
92    
93     @@ -144,6 +147,7 @@ rm -f fake
94    
95     echo "OS=$OS" > $CONFFILE
96     echo "STG_TIME=yes" >> $CONFFILE
97     +echo "DEBUG=$DEBUG" >> $CONFFILE
98     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
99     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
100     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
101     diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile
102     index 0912be0..da06b50 100644
103     --- a/projects/rscriptd/Makefile
104     +++ b/projects/rscriptd/Makefile
105     @@ -57,7 +57,11 @@ distclean: clean
106     install: install-bin install-data
107    
108     install-bin:
109     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
110     +ifeq ($(DEBUG), yes)
111     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
112     +else
113     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
114     +endif
115     $(MAKE) -C $(DIR_LIBSRC) install
116    
117     install-data:
118     diff --git a/projects/rscriptd/build b/projects/rscriptd/build
119     index 885eef7..6a7c77f 100755
120     --- a/projects/rscriptd/build
121     +++ b/projects/rscriptd/build
122     @@ -19,14 +19,17 @@ OWNER=root
123     if [ -z $1 ]
124     then
125     MAKEOPTS="-j1"
126     + DEBUG="no"
127     else
128     if [ "$1" = "debug" ]
129     then
130     DEFS="-DDEBUG"
131     MAKEOPTS="-j1"
132     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
133     + DEBUG="yes"
134     else
135     MAKEOPTS="-j1"
136     + DEBUG="no"
137     fi
138     fi
139    
140     @@ -150,6 +153,7 @@ rm -f build_check.c
141    
142     echo "OS=$OS" > $CONFFILE
143     echo "STG_TIME=yes" >> $CONFFILE
144     +echo "DEBUG=$DEBUG" >> $CONFFILE
145     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
146     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
147     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
148     diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile
149     index 99cd0e4..a59371c 100644
150     --- a/projects/sgauth/Makefile
151     +++ b/projects/sgauth/Makefile
152     @@ -58,7 +58,11 @@ distclean: clean
153     install: install-bin install-data
154    
155     install-bin:
156     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
157     +ifeq ($(DEBUG), yes)
158     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
159     +else
160     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
161     +endif
162     $(MAKE) -C $(DIR_LIBSRC) install
163    
164     install-data:
165     diff --git a/projects/sgauth/build b/projects/sgauth/build
166     index ec747e2..e3ad87f 100755
167     --- a/projects/sgauth/build
168     +++ b/projects/sgauth/build
169     @@ -19,14 +19,17 @@ OWNER=root
170     if [ -z $1 ]
171     then
172     MAKEOPTS="-j1"
173     + DEBUG="no"
174     else
175     if [ "$1" = "debug" ]
176     then
177     DEFS="-DDEBUG"
178     MAKEOPTS="-j1"
179     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
180     + DEBUG="yes"
181     else
182     MAKEOPTS="-j1"
183     + DEBUG="no"
184     fi
185     fi
186    
187     @@ -148,6 +151,7 @@ rm -f build_check.c
188    
189     echo "OS=$OS" > $CONFFILE
190     echo "STG_TIME=yes" >> $CONFFILE
191     +echo "DEBUG=$DEBUG" >> $CONFFILE
192     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
193     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
194     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
195     diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile
196     index 4d62bb5..297d3e2 100644
197     --- a/projects/sgconf/Makefile
198     +++ b/projects/sgconf/Makefile
199     @@ -66,7 +66,11 @@ distclean: clean
200     install: install-bin
201    
202     install-bin:
203     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
204     +ifeq ($(DEBUG), yes)
205     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
206     +else
207     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
208     +endif
209     $(MAKE) -C $(DIR_LIBSRC) install
210    
211     uninstall: uninstall-bin
212     diff --git a/projects/sgconf/build b/projects/sgconf/build
213     index 1f6c0a0..da81773 100755
214     --- a/projects/sgconf/build
215     +++ b/projects/sgconf/build
216     @@ -19,14 +19,17 @@ OWNER=root
217     if [ -z $1 ]
218     then
219     MAKEOPTS="-j1"
220     + DEBUG="no"
221     else
222     if [ "$1" = "debug" ]
223     then
224     DEFS="-DDEBUG"
225     MAKEOPTS="-j1"
226     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
227     + DEBUG="yes"
228     else
229     MAKEOPTS="-j1"
230     + DEBUG="no"
231     fi
232     fi
233    
234     @@ -166,6 +169,7 @@ fi
235    
236     echo "OS=$OS" > $CONFFILE
237     echo "STG_TIME=yes" >> $CONFFILE
238     +echo "DEBUG=$DEBUG" >> $CONFFILE
239     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
240     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
241     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
242     diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile
243     index b7ebca0..32384e6 100644
244     --- a/projects/sgconf_xml/Makefile
245     +++ b/projects/sgconf_xml/Makefile
246     @@ -66,7 +66,11 @@ distclean: clean
247     install: install-bin install-data
248    
249     install-bin:
250     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
251     +ifeq ($(DEBUG), yes)
252     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG)
253     +else
254     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG)
255     +endif
256     $(MAKE) -C $(DIR_LIBSRC) install
257    
258     uninstall: uninstall-bin uninstall-data
259     diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build
260     index f78e6f7..9797075 100755
261     --- a/projects/sgconf_xml/build
262     +++ b/projects/sgconf_xml/build
263     @@ -19,14 +19,17 @@ OWNER=root
264     if [ -z $1 ]
265     then
266     MAKEOPTS="-j1"
267     + DEBUG="no"
268     else
269     if [ "$1" = "debug" ]
270     then
271     DEFS="-DDEBUG"
272     MAKEOPTS="-j1"
273     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
274     + DEBUG="yes"
275     else
276     MAKEOPTS="-j1"
277     + DEBUG="no"
278     fi
279     fi
280    
281     @@ -166,6 +169,7 @@ fi
282    
283     echo "OS=$OS" > $CONFFILE
284     echo "STG_TIME=yes" >> $CONFFILE
285     +echo "DEBUG=$DEBUG" >> $CONFFILE
286     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
287     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
288     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
289     diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile
290     index 44ae35e..9dfc0b5 100644
291     --- a/projects/stargazer/Makefile
292     +++ b/projects/stargazer/Makefile
293     @@ -77,7 +77,11 @@ distclean: clean
294     install: install-bin install-data
295    
296     install-bin: $(PROG)
297     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
298     +ifeq ($(DEBUG), yes)
299     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG)
300     +else
301     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG)
302     +endif
303     $(MAKE) -C $(DIR_INCLUDE) install
304     $(MAKE) -C $(DIR_LIBSRC) install
305     $(MAKE) -C $(DIR_PLUGINS) install
306     diff --git a/projects/stargazer/build b/projects/stargazer/build
307     index c58b969..8a34c4f 100755
308     --- a/projects/stargazer/build
309     +++ b/projects/stargazer/build
310     @@ -39,15 +39,18 @@ if [ -z "$1" ]
311     then
312     DEFS="$DEFS -DNDEBUG"
313     MAKEOPTS="-j1"
314     + DEBUG="no"
315     else
316     if [ "$1" = "debug" ]
317     then
318     DEFS="$DEFS -DDEBUG"
319     MAKEOPTS="-j1"
320     CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall"
321     + DEBUG="yes"
322     else
323     DEFS="$DEFS -DNDEBUG"
324     MAKEOPTS="-j1"
325     + DEBUG="no"
326     fi
327     fi
328    
329     @@ -391,6 +394,7 @@ fi
330    
331     echo "OS=$OS" > $CONFFILE
332     echo "STG_TIME=yes" >> $CONFFILE
333     +echo "DEBUG=$DEBUG" >> $CONFFILE
334     echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE
335     echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE
336     echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE
337     diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in
338     index 17e10ac..70954a2 100644
339     --- a/projects/stargazer/plugins/Makefile.in
340     +++ b/projects/stargazer/plugins/Makefile.in
341     @@ -15,12 +15,12 @@ LIBS += $(addprefix -lstg,$(STGLIBS))
342    
343     CXXFLAGS += -fPIC $(STGLIBS_INCS)
344     CFLAGS += -fPIC $(STGLIBS_INCS)
345     -LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg $(STGLIBS_LIBS)
346     +LDFLAGS += -shared -Wl,-rpath,$(PREFIX)/usr/lib/stg
347    
348     all: $(PROG)
349    
350     $(PROG): $(OBJS)
351     - $(CXX) $^ $(LDFLAGS) $(LIBS) -o $(PROG)
352     + $(CXX) $^ $(STGLIBS_LIBS) $(LIBS) $(LDFLAGS) -o $(PROG)
353     $(LN) -fs "`pwd`/$(PROG)" $(DIR_MOD)/$(PROG)
354    
355     clean:
356     @@ -28,7 +28,11 @@ clean:
357    
358     install: $(PROG)
359     mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
360     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
361     +ifeq ($(DEBUG), yes)
362     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
363     +else
364     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
365     +endif
366    
367     uninstall:
368     rm -f $(PREFIX)/usr/lib/stg/$(PROG)
369     diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in
370     index a318497..b5d1195 100644
371     --- a/stglibs/Makefile.in
372     +++ b/stglibs/Makefile.in
373     @@ -35,8 +35,11 @@ clean:
374     rm -f deps $(PROG) *.o *.a *.so tags *.*~
375    
376     install: $(PROG)
377     - mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg
378     - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
379     +ifeq ($(DEBUG), yes)
380     + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
381     +else
382     + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG)
383     +endif
384     mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg
385     install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/
386    

  ViewVC Help
Powered by ViewVC 1.1.20