| 1 |
xarthisius 10/08/24 18:37:52 |
| 2 |
|
| 3 |
Added: apwal-0.4.5-makefile.patch |
| 4 |
Log: |
| 5 |
Respect user flags wrt bug 333969. Thanks to Diego for report. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/apwal/files/apwal-0.4.5-makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/apwal/files/apwal-0.4.5-makefile.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/apwal/files/apwal-0.4.5-makefile.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: apwal-0.4.5-makefile.patch |
| 15 |
=================================================================== |
| 16 |
* Fix parallel build |
| 17 |
* Respect CC, CFLAGS, LDFLAGS #333969 |
| 18 |
* don't strip binaries |
| 19 |
* fix install paths |
| 20 |
|
| 21 |
--- Makefile |
| 22 |
+++ Makefile |
| 23 |
@@ -1,11 +1,8 @@ |
| 24 |
|
| 25 |
include Makefile.inc |
| 26 |
|
| 27 |
-all: |
| 28 |
- (cd src && $(MAKE) $@) |
| 29 |
- |
| 30 |
-install: |
| 31 |
- (cd src && $(MAKE) $@) |
| 32 |
+all install: |
| 33 |
+ $(MAKE) -C src $@ |
| 34 |
|
| 35 |
clean: |
| 36 |
(cd src && $(MAKE) $@) |
| 37 |
--- src/Makefile |
| 38 |
+++ src/Makefile |
| 39 |
@@ -5,8 +5,8 @@ |
| 40 |
CFLAGS=-g -Wall -Werror `pkg-config --cflags gtk+-2.0 gthread-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG |
| 41 |
LDFLAGS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` |
| 42 |
else |
| 43 |
-CFLAGS=-O2 `pkg-config --cflags gtk+-2.0 gthread-2.0` |
| 44 |
-LDFLAGS=-O2 `pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` |
| 45 |
+CPPFLAGS=`pkg-config --cflags gtk+-2.0 gthread-2.0` |
| 46 |
+LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs` |
| 47 |
endif |
| 48 |
|
| 49 |
OBJS=main.o app.o launcher.o editor.o property.o \ |
| 50 |
@@ -24,25 +24,24 @@ |
| 51 |
ifdef APWAL_DEBUG |
| 52 |
all: checktraceformat apwal tags |
| 53 |
apwal: $(OBJS) |
| 54 |
- gcc -o $@ $^ $(LDFLAGS) |
| 55 |
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 56 |
else |
| 57 |
all: apwal |
| 58 |
apwal: $(OBJS) |
| 59 |
- gcc -o $@ $^ $(LDFLAGS) |
| 60 |
- strip $@ |
| 61 |
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 62 |
endif |
| 63 |
|
| 64 |
install: all |
| 65 |
- cp apwal /usr/local/bin/ |
| 66 |
- ln -sf /usr/local/bin/apwal /usr/local/bin/apwal-editor |
| 67 |
+ install -D -m 755 apwal $(DESTDIR)/usr/bin/apwal |
| 68 |
+ ln -sf apwal $(DESTDIR)/usr/bin/apwal-editor |
| 69 |
|
| 70 |
.c.o: $(INCS) |
| 71 |
- gcc -c $< -o $*.o $(CFLAGS) |
| 72 |
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $*.o |
| 73 |
|
| 74 |
xmlrc.o: xmlrc.c $(INCS) |
| 75 |
- gcc -c $< -o $*.o $(CFLAGS) `xml2-config --cflags` |
| 76 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) `xml2-config --cflags` -c $< -o $*.o |
| 77 |
about.o: about.c $(INCS) ../Makefile.inc |
| 78 |
- gcc -c $< -o $*.o $(CFLAGS) -DAPWAL_VERSION=\"$(VERS)\" |
| 79 |
+ $(CC) $(CPPFLAGS) -DAPWAL_VERSION=\"$(VERS)\" $(CFLAGS) -c $< -o $*.o |
| 80 |
|
| 81 |
gtkstuff.o: pixbufinline.inc |
| 82 |
xmlrc.o: xmlrcinline.inc |
Archives