* [gentoo-commits] gentoo-x86 commit in app-text/noweb/files: noweb-2.11b-ldflags.patch noweb-2.11b-recmake.patch
@ 2010-10-30 22:23 99% Alexis Ballier (aballier)
0 siblings, 0 replies; 1+ results
From: Alexis Ballier (aballier) @ 2010-10-30 22:23 UTC (permalink / raw
To: gentoo-commits
aballier 10/10/30 22:23:23
Added: noweb-2.11b-ldflags.patch noweb-2.11b-recmake.patch
Log:
Respect ldflags (bug #338899) and use $(MAKE) for recursive make, by Wormo, bug #264273
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Revision Changes Path
1.1 app-text/noweb/files/noweb-2.11b-ldflags.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/noweb/files/noweb-2.11b-ldflags.patch?rev=1.1&view=markup
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
Index: noweb-2.11b-ldflags.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=338899
Index: noweb-2.11b/src/c/Makefile
===================================================================
--- noweb-2.11b.orig/src/c/Makefile
+++ noweb-2.11b/src/c/Makefile
@@ -41,16 +41,16 @@ CPIF=>
all: nt markup mnt finduses
nt: $(TANGLEOBJS)
- $(CC) $(CFLAGS) -o nt $(TANGLEOBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nt $(TANGLEOBJS)
finduses: $(FINDUSESOBJS)
- $(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
+
markup: $(MARKUPOBJS)
- $(CC) $(CFLAGS) -o markup $(MARKUPOBJS)
+
mnt: $(MNTOBJS)
- $(CC) $(CFLAGS) -o mnt $(MNTOBJS)
+
source: $(SRCS)
touch: $(SRCS)
1.1 app-text/noweb/files/noweb-2.11b-recmake.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/noweb/files/noweb-2.11b-recmake.patch?rev=1.1&view=markup
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
Index: noweb-2.11b-recmake.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=264273
Index: noweb-2.11b/Makefile
===================================================================
--- noweb-2.11b.orig/Makefile
+++ noweb-2.11b/Makefile
@@ -9,14 +9,14 @@ SHELL=/bin/sh
CINAME=-Nv`echo $(VERSION) | tr . _`
CIMSG=-f -m'standard checkin preparing to export version $(VERSION)'
-source: ; for i in src; do (cd $$i; make source); done
-www: ; for i in src/xdoc examples; do (cd $$i; make www); done
+source: ; for i in src; do (cd $$i; $(MAKE) source); done
+www: ; for i in src/xdoc examples; do (cd $$i; $(MAKE) www); done
clean:
- for i in src examples contrib; do (cd $$i; make clean); done
+ for i in src examples contrib; do (cd $$i; $(MAKE) clean); done
rm -f nwsrcfilter *~ */*~
clobber: clean
- for i in src examples contrib; do (cd $$i; make clobber); done
+ for i in src examples contrib; do (cd $$i; $(MAKE) clobber); done
DATE:
(./echo -n "Version $(VERSION) of "; date) > DATE
@@ -51,6 +51,6 @@ emacscheck:
diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el
checkin:
- (cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
+ (cd src; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
Index: noweb-2.11b/contrib/norman/Makefile
===================================================================
--- noweb-2.11b.orig/contrib/norman/Makefile
+++ noweb-2.11b/contrib/norman/Makefile
@@ -1,10 +1,10 @@
LIB=/dev/null # to be overridden
DIRS=numarkup
-all: ; for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done
-install: ; for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done
-source: ; for i in $(DIRS); do (cd $$i; make source); done
-clean: ; for i in $(DIRS); do (cd $$i; make clean); done
+all: ; for i in $(DIRS); do (cd $$i; $(MAKE) ICONC=$(ICONC) ICONT=$(ICONT) all); done
+install: ; for i in $(DIRS); do (cd $$i; $(MAKE) LIB=$(LIB) BIN=$(BIN) install); done
+source: ; for i in $(DIRS); do (cd $$i; $(MAKE) source); done
+clean: ; for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
iconlib: # cheap hack for slackmake
true
Index: noweb-2.11b/contrib/norman/numarkup/Makefile
===================================================================
--- noweb-2.11b.orig/contrib/norman/numarkup/Makefile
+++ noweb-2.11b/contrib/norman/numarkup/Makefile
@@ -11,11 +11,11 @@ OBJS = main.o pass1.o latex.o input.o sc
all:
noweb -t numarkup.nw
- make $(TARGET)
+ $(MAKE) $(TARGET)
install:
noweb -t numarkup.nw
- make $(TARGET)
+ $(MAKE) $(TARGET)
strip $(TARGET)
cp $(TARGET) $(LIB)
Index: noweb-2.11b/src/Makefile
===================================================================
--- noweb-2.11b.orig/src/Makefile
+++ noweb-2.11b/src/Makefile
@@ -41,9 +41,9 @@ LIBNAME=$(LIB)
TEXNAME=$(TEXINPUTS)
all:
- cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
- for i in shell lib xdoc tex; do (cd $$i; make all); done
- cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
+ cd c; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" all
+ for i in shell lib xdoc tex; do (cd $$i; $(MAKE) all); done
+ cd $(LIBSRC); $(MAKE) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
FAQ: FAQ.html
sleep 1; html2ascii FAQ.html > FAQ
@@ -101,13 +101,13 @@ install-code: install-shell
-mkdir $(BIN) $(LIB) 2>/dev/null
true c/nt c/markup c/mnt c/finduses
cp c/nt c/markup c/mnt c/finduses $(LIB)
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
- cd lib; make LIB=$(LIB) install
+ cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
+ cd lib; $(MAKE) LIB=$(LIB) install
uninstall-code: uninstall-shell
rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses
- cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
- cd lib; make LIB=$(LIB) uninstall
+ cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
+ cd lib; $(MAKE) LIB=$(LIB) uninstall
install-man:
-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
@@ -193,24 +193,24 @@ install-elisp:
uninstall-elisp:
rm -f $(ELISP)/noweb-mode.el
checkin:
- for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
+ for i in lib tex xdoc; do (cd $$i; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
source: FAQ
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) CPIF=">" source); done
sleep 1
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
touch:
touch FAQ
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
clean:
- for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
+ for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) clean); done
rm -f nwsrcfilter *~ */*~
clobber: clean
- for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
+ for i in c lib icon awk xdoc; do (cd $$i; $(MAKE) clobber); done
Makefile: Makefile.nw
chmod +w Makefile
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-10-30 22:23 99% [gentoo-commits] gentoo-x86 commit in app-text/noweb/files: noweb-2.11b-ldflags.patch noweb-2.11b-recmake.patch Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox