| 1 |
bangert 09/04/19 18:51:35 |
| 2 |
|
| 3 |
Added: |
| 4 |
monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch |
| 5 |
Log: |
| 6 |
misc qa fixes - fix --as-needed (bug #248483) |
| 7 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch |
| 16 |
=================================================================== |
| 17 |
improve hand-made buildsystem |
| 18 |
- fixes --as-needed link |
| 19 |
- fixes jobserver |
| 20 |
- fixes strip |
| 21 |
|
| 22 |
by bangert@g.o |
| 23 |
diff -Naur monkey-0.9.2.orig/configure monkey-0.9.2/configure |
| 24 |
--- monkey-0.9.2.orig/configure 2008-01-17 12:29:36.000000000 +0100 |
| 25 |
+++ monkey-0.9.2/configure 2009-04-19 20:38:00.000000000 +0200 |
| 26 |
@@ -251,7 +251,7 @@ |
| 27 |
# Monkey HTTP Daemon: Makefile |
| 28 |
# ============================ |
| 29 |
default: |
| 30 |
- @(cd src; make all) |
| 31 |
+ @(cd src; \$(MAKE) all) |
| 32 |
@echo |
| 33 |
@echo " Running Monkey :" |
| 34 |
@echo " ----------------" |
| 35 |
@@ -261,9 +261,9 @@ |
| 36 |
@echo " For more help use '-h' option." |
| 37 |
@echo |
| 38 |
clean: |
| 39 |
- @(cd src; make clean) |
| 40 |
+ @(cd src; \$(MAKE) clean) |
| 41 |
distclean: |
| 42 |
- @(cd src; make distclean) |
| 43 |
+ @(cd src; \$(MAKE) distclean) |
| 44 |
EOF |
| 45 |
} |
| 46 |
|
| 47 |
@@ -280,14 +280,14 @@ |
| 48 |
LOGDIR=${logdir} |
| 49 |
|
| 50 |
default: |
| 51 |
- @(cd src; make all) |
| 52 |
+ @(cd src; \$(MAKE) all) |
| 53 |
clean: |
| 54 |
- @(cd src; make clean) |
| 55 |
+ @(cd src; \$(MAKE) clean) |
| 56 |
distclean: |
| 57 |
- @(cd src; make distclean) |
| 58 |
+ @(cd src; \$(MAKE) distclean) |
| 59 |
|
| 60 |
install: |
| 61 |
- make -C src all |
| 62 |
+ \$(MAKE) -C src all |
| 63 |
install -d \$(BINDIR) |
| 64 |
install -d \$(CGIBIN) |
| 65 |
install -d \$(SYSCONFDIR) |
| 66 |
@@ -296,7 +296,7 @@ |
| 67 |
install -d \${DATADIR}/php |
| 68 |
install -d \${DATADIR}/docs |
| 69 |
install -d \${LOGDIR} |
| 70 |
- install -s -m 755 bin/monkey \$(BINDIR) |
| 71 |
+ install -m 755 bin/monkey \$(BINDIR) |
| 72 |
install -m 755 bin/banana \$(BINDIR) |
| 73 |
install -m 755 ./cgi-bin/* \$(CGIBIN) |
| 74 |
install -m 600 ./conf/*.* \$(SYSCONFDIR) |
| 75 |
@@ -334,9 +334,7 @@ |
| 76 |
cat > src/Makefile<<EOF |
| 77 |
CC = $CC |
| 78 |
DEFS = $mod_defs |
| 79 |
-CFLAGS = \$(DEFS) -g -O2 -Wall |
| 80 |
INCDIR = ./include |
| 81 |
-LDFLAGS = |
| 82 |
DESTDIR = ../bin/monkey |
| 83 |
LIBS = -lpthread $mod_libs $MORE_LIBS |
| 84 |
OBJ = monkey.o method.o mimetype.o request.o \\ |
| 85 |
@@ -350,8 +348,7 @@ |
| 86 |
$make_script |
| 87 |
|
| 88 |
../bin/monkey: \$(OBJ) |
| 89 |
- \$(CC) \$(CFLAGS) \$(LIBS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj |
| 90 |
- $STRIP ../bin/monkey |
| 91 |
+ \$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj \$(LIBS) |
| 92 |
|
| 93 |
clean: |
| 94 |
rm -rf *.o |
Archives