| 1 |
aballier 10/10/30 22:23:23 |
| 2 |
|
| 3 |
Added: noweb-2.11b-ldflags.patch noweb-2.11b-recmake.patch |
| 4 |
Log: |
| 5 |
Respect ldflags (bug #338899) and use $(MAKE) for recursive make, by Wormo, bug #264273 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-text/noweb/files/noweb-2.11b-ldflags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/noweb/files/noweb-2.11b-ldflags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/noweb/files/noweb-2.11b-ldflags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: noweb-2.11b-ldflags.patch |
| 16 |
=================================================================== |
| 17 |
https://bugs.gentoo.org/show_bug.cgi?id=338899 |
| 18 |
|
| 19 |
Index: noweb-2.11b/src/c/Makefile |
| 20 |
=================================================================== |
| 21 |
--- noweb-2.11b.orig/src/c/Makefile |
| 22 |
+++ noweb-2.11b/src/c/Makefile |
| 23 |
@@ -41,16 +41,16 @@ CPIF=> |
| 24 |
all: nt markup mnt finduses |
| 25 |
|
| 26 |
nt: $(TANGLEOBJS) |
| 27 |
- $(CC) $(CFLAGS) -o nt $(TANGLEOBJS) |
| 28 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nt $(TANGLEOBJS) |
| 29 |
|
| 30 |
finduses: $(FINDUSESOBJS) |
| 31 |
- $(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS) |
| 32 |
+ |
| 33 |
|
| 34 |
markup: $(MARKUPOBJS) |
| 35 |
- $(CC) $(CFLAGS) -o markup $(MARKUPOBJS) |
| 36 |
+ |
| 37 |
|
| 38 |
mnt: $(MNTOBJS) |
| 39 |
- $(CC) $(CFLAGS) -o mnt $(MNTOBJS) |
| 40 |
+ |
| 41 |
|
| 42 |
source: $(SRCS) |
| 43 |
touch: $(SRCS) |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 app-text/noweb/files/noweb-2.11b-recmake.patch |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/noweb/files/noweb-2.11b-recmake.patch?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/noweb/files/noweb-2.11b-recmake.patch?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: noweb-2.11b-recmake.patch |
| 53 |
=================================================================== |
| 54 |
https://bugs.gentoo.org/show_bug.cgi?id=264273 |
| 55 |
|
| 56 |
Index: noweb-2.11b/Makefile |
| 57 |
=================================================================== |
| 58 |
--- noweb-2.11b.orig/Makefile |
| 59 |
+++ noweb-2.11b/Makefile |
| 60 |
@@ -9,14 +9,14 @@ SHELL=/bin/sh |
| 61 |
CINAME=-Nv`echo $(VERSION) | tr . _` |
| 62 |
CIMSG=-f -m'standard checkin preparing to export version $(VERSION)' |
| 63 |
|
| 64 |
-source: ; for i in src; do (cd $$i; make source); done |
| 65 |
-www: ; for i in src/xdoc examples; do (cd $$i; make www); done |
| 66 |
+source: ; for i in src; do (cd $$i; $(MAKE) source); done |
| 67 |
+www: ; for i in src/xdoc examples; do (cd $$i; $(MAKE) www); done |
| 68 |
|
| 69 |
clean: |
| 70 |
- for i in src examples contrib; do (cd $$i; make clean); done |
| 71 |
+ for i in src examples contrib; do (cd $$i; $(MAKE) clean); done |
| 72 |
rm -f nwsrcfilter *~ */*~ |
| 73 |
clobber: clean |
| 74 |
- for i in src examples contrib; do (cd $$i; make clobber); done |
| 75 |
+ for i in src examples contrib; do (cd $$i; $(MAKE) clobber); done |
| 76 |
|
| 77 |
DATE: |
| 78 |
(./echo -n "Version $(VERSION) of "; date) > DATE |
| 79 |
@@ -51,6 +51,6 @@ emacscheck: |
| 80 |
diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el |
| 81 |
|
| 82 |
checkin: |
| 83 |
- (cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin) |
| 84 |
+ (cd src; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin) |
| 85 |
|
| 86 |
|
| 87 |
Index: noweb-2.11b/contrib/norman/Makefile |
| 88 |
=================================================================== |
| 89 |
--- noweb-2.11b.orig/contrib/norman/Makefile |
| 90 |
+++ noweb-2.11b/contrib/norman/Makefile |
| 91 |
@@ -1,10 +1,10 @@ |
| 92 |
LIB=/dev/null # to be overridden |
| 93 |
DIRS=numarkup |
| 94 |
|
| 95 |
-all: ; for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done |
| 96 |
-install: ; for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done |
| 97 |
-source: ; for i in $(DIRS); do (cd $$i; make source); done |
| 98 |
-clean: ; for i in $(DIRS); do (cd $$i; make clean); done |
| 99 |
+all: ; for i in $(DIRS); do (cd $$i; $(MAKE) ICONC=$(ICONC) ICONT=$(ICONT) all); done |
| 100 |
+install: ; for i in $(DIRS); do (cd $$i; $(MAKE) LIB=$(LIB) BIN=$(BIN) install); done |
| 101 |
+source: ; for i in $(DIRS); do (cd $$i; $(MAKE) source); done |
| 102 |
+clean: ; for i in $(DIRS); do (cd $$i; $(MAKE) clean); done |
| 103 |
iconlib: # cheap hack for slackmake |
| 104 |
true |
| 105 |
|
| 106 |
Index: noweb-2.11b/contrib/norman/numarkup/Makefile |
| 107 |
=================================================================== |
| 108 |
--- noweb-2.11b.orig/contrib/norman/numarkup/Makefile |
| 109 |
+++ noweb-2.11b/contrib/norman/numarkup/Makefile |
| 110 |
@@ -11,11 +11,11 @@ OBJS = main.o pass1.o latex.o input.o sc |
| 111 |
|
| 112 |
all: |
| 113 |
noweb -t numarkup.nw |
| 114 |
- make $(TARGET) |
| 115 |
+ $(MAKE) $(TARGET) |
| 116 |
|
| 117 |
install: |
| 118 |
noweb -t numarkup.nw |
| 119 |
- make $(TARGET) |
| 120 |
+ $(MAKE) $(TARGET) |
| 121 |
strip $(TARGET) |
| 122 |
cp $(TARGET) $(LIB) |
| 123 |
|
| 124 |
Index: noweb-2.11b/src/Makefile |
| 125 |
=================================================================== |
| 126 |
--- noweb-2.11b.orig/src/Makefile |
| 127 |
+++ noweb-2.11b/src/Makefile |
| 128 |
@@ -41,9 +41,9 @@ LIBNAME=$(LIB) |
| 129 |
TEXNAME=$(TEXINPUTS) |
| 130 |
|
| 131 |
all: |
| 132 |
- cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all |
| 133 |
- for i in shell lib xdoc tex; do (cd $$i; make all); done |
| 134 |
- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all |
| 135 |
+ cd c; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" all |
| 136 |
+ for i in shell lib xdoc tex; do (cd $$i; $(MAKE) all); done |
| 137 |
+ cd $(LIBSRC); $(MAKE) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all |
| 138 |
|
| 139 |
FAQ: FAQ.html |
| 140 |
sleep 1; html2ascii FAQ.html > FAQ |
| 141 |
@@ -101,13 +101,13 @@ install-code: install-shell |
| 142 |
-mkdir $(BIN) $(LIB) 2>/dev/null |
| 143 |
true c/nt c/markup c/mnt c/finduses |
| 144 |
cp c/nt c/markup c/mnt c/finduses $(LIB) |
| 145 |
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install |
| 146 |
- cd lib; make LIB=$(LIB) install |
| 147 |
+ cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install |
| 148 |
+ cd lib; $(MAKE) LIB=$(LIB) install |
| 149 |
|
| 150 |
uninstall-code: uninstall-shell |
| 151 |
rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses |
| 152 |
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall |
| 153 |
- cd lib; make LIB=$(LIB) uninstall |
| 154 |
+ cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall |
| 155 |
+ cd lib; $(MAKE) LIB=$(LIB) uninstall |
| 156 |
install-man: |
| 157 |
-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null |
| 158 |
sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT) |
| 159 |
@@ -193,24 +193,24 @@ install-elisp: |
| 160 |
uninstall-elisp: |
| 161 |
rm -f $(ELISP)/noweb-mode.el |
| 162 |
checkin: |
| 163 |
- for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done |
| 164 |
+ for i in lib tex xdoc; do (cd $$i; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done |
| 165 |
for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done |
| 166 |
(cd elisp; ci -l $(CINAME) $(CIMSG) *.el) |
| 167 |
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw |
| 168 |
|
| 169 |
source: FAQ |
| 170 |
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done |
| 171 |
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) CPIF=">" source); done |
| 172 |
sleep 1 |
| 173 |
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done |
| 174 |
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done |
| 175 |
touch: |
| 176 |
touch FAQ |
| 177 |
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done |
| 178 |
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done |
| 179 |
clean: |
| 180 |
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done |
| 181 |
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) clean); done |
| 182 |
rm -f nwsrcfilter *~ */*~ |
| 183 |
|
| 184 |
clobber: clean |
| 185 |
- for i in c lib icon awk xdoc; do (cd $$i; make clobber); done |
| 186 |
+ for i in c lib icon awk xdoc; do (cd $$i; $(MAKE) clobber); done |
| 187 |
|
| 188 |
Makefile: Makefile.nw |
| 189 |
chmod +w Makefile |
Archives