wok rev 14344
tcc: update patch
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Apr 14 14:51:53 2013 +0200 (2013-04-14) |
| parents | 83f4594dbebd |
| children | 26f00ffd5a27 |
| files | tcc/receipt tcc/stuff/Makefile.u |
line diff
1.1 --- a/tcc/receipt Sun Apr 14 13:40:01 2013 +0200 1.2 +++ b/tcc/receipt Sun Apr 14 14:51:53 2013 +0200 1.3 @@ -27,10 +27,6 @@ 1.4 patch < $stuff/Makefile.u || return 1 1.5 touch done.Makefile.u 1.6 fi 1.7 - sed -i 's/cp -u/cp/' tests/Makefile 1.8 - sed -i 's, tcctest.gcc .*, tcctest.gcc $< -I. -w $(shell echo $(CFLAGS) | sed "s/-O2//"),' \ 1.9 - tests/Makefile 1.10 - sed -i 's/array_test(int.*/array_test()/;s/.*array:.*/int a[4];\n&/' tests/tcctest.c 1.11 ./configure \ 1.12 --prefix=/usr \ 1.13 --enable-cross \
2.1 --- a/tcc/stuff/Makefile.u Sun Apr 14 13:40:01 2013 +0200 2.2 +++ b/tcc/stuff/Makefile.u Sun Apr 14 14:51:53 2013 +0200 2.3 @@ -1,84 +1,142 @@ 2.4 ---- tcc-0.9.25/Makefile 2.5 -+++ tcc-0.9.25/Makefile 2.6 -@@ -197,48 +197,48 @@ 2.7 +--- tcc-0.9.26/Makefile 2.8 ++++ tcc-0.9.26/Makefile 2.9 +@@ -218,84 +218,84 @@ 2.10 2.11 ifndef CONFIG_WIN32 2.12 - install: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc.1 tcc-doc.html 2.13 + install: $(PROGS) $(TCCLIBS) $(TCCDOCS) 2.14 - mkdir -p "$(bindir)" 2.15 -- $(INSTALL) -s -m755 $(PROGS) "$(bindir)" 2.16 ++ mkdir -p "$(DESTDIR)/$(bindir)" 2.17 + ifeq ($(CC),tcc) 2.18 +- $(INSTALL) -m755 $(PROGS) "$(bindir)" 2.19 ++ $(INSTALL) -m755 $(PROGS) "$(DESTDIR)/$(bindir)" 2.20 + else 2.21 +- $(INSTALLBIN) -m755 $(PROGS) "$(bindir)" 2.22 ++ $(INSTALLBIN) -m755 $(PROGS) "$(DESTDIR)/$(bindir)" 2.23 + endif 2.24 - mkdir -p "$(mandir)/man1" 2.25 -- $(INSTALL) tcc.1 "$(mandir)/man1" 2.26 +- -$(INSTALL) tcc.1 "$(mandir)/man1" 2.27 +- mkdir -p "$(infodir)" 2.28 +- -$(INSTALL) tcc-doc.info "$(infodir)" 2.29 - mkdir -p "$(tccdir)" 2.30 - mkdir -p "$(tccdir)/include" 2.31 -+ mkdir -p "$(DESTDIR)/$(bindir)" 2.32 -+ $(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(bindir)" 2.33 + mkdir -p "$(DESTDIR)/$(mandir)/man1" 2.34 -+ $(INSTALL) tcc.1 "$(DESTDIR)/$(mandir)/man1" 2.35 ++ -$(INSTALL) tcc.1 "$(DESTDIR)/$(mandir)/man1" 2.36 ++ mkdir -p "$(DESTDIR)/$(infodir)" 2.37 ++ -$(INSTALL) tcc-doc.info "$(DESTDIR)/$(infodir)" 2.38 + mkdir -p "$(DESTDIR)/$(tccdir)" 2.39 + mkdir -p "$(DESTDIR)/$(tccdir)/include" 2.40 ifneq ($(LIBTCC1),) 2.41 - $(INSTALL) -m644 $(LIBTCC1) "$(tccdir)" 2.42 + $(INSTALL) -m644 $(LIBTCC1) "$(DESTDIR)/$(tccdir)" 2.43 endif 2.44 - ifneq ($(BCHECK_O),) 2.45 -- $(INSTALL) -m644 $(BCHECK_O) "$(tccdir)" 2.46 -+ $(INSTALL) -m644 $(BCHECK_O) "$(DESTDIR)/$(tccdir)" 2.47 +- $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) "$(tccdir)/include" 2.48 ++ $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 2.49 + mkdir -p "$(libdir)" 2.50 +- $(INSTALL) -m755 $(LIBTCC) "$(libdir)" 2.51 ++ $(INSTALL) -m755 $(LIBTCC) "$(DESTDIR)/$(libdir)" 2.52 + ifdef DISABLE_STATIC 2.53 +- ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(libdir)/libtcc.so.1" 2.54 +- ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(libdir)/libtcc.so" 2.55 ++ ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(DESTDIR)/$(libdir)/libtcc.so.1" 2.56 ++ ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(DESTDIR)/$(libdir)/libtcc.so" 2.57 endif 2.58 -- $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" 2.59 +- mkdir -p "$(includedir)" 2.60 +- $(INSTALL) -m644 $(top_srcdir)/libtcc.h "$(includedir)" 2.61 - mkdir -p "$(docdir)" 2.62 -- $(INSTALL) -m644 tcc-doc.html "$(docdir)" 2.63 -- mkdir -p "$(libdir)" 2.64 -- $(INSTALL) -m644 libtcc.a "$(libdir)" 2.65 -- mkdir -p "$(includedir)" 2.66 -- $(INSTALL) -m644 libtcc.h "$(includedir)" 2.67 -+ $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 2.68 +- -$(INSTALL) -m644 tcc-doc.html "$(docdir)" 2.69 ++ mkdir -p "$(DESTDIR)/$(includedir)" 2.70 ++ $(INSTALL) -m644 $(top_srcdir)/libtcc.h "$(DESTDIR)/$(includedir)" 2.71 + mkdir -p "$(DESTDIR)/$(docdir)" 2.72 -+ $(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)" 2.73 -+ mkdir -p "$(DESTDIR)/$(libdir)" 2.74 -+ $(INSTALL) -m644 libtcc.a "$(DESTDIR)/$(libdir)" 2.75 -+ mkdir -p "$(DESTDIR)/$(includedir)" 2.76 -+ $(INSTALL) -m644 libtcc.h "$(DESTDIR)/$(includedir)" 2.77 ++ -$(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)" 2.78 + ifdef CONFIG_CROSS 2.79 +- mkdir -p "$(tccdir)/win32/lib/32" 2.80 +- mkdir -p "$(tccdir)/win32/lib/64" 2.81 ++ mkdir -p "$(DESTDIR)/$(tccdir)/win32/lib/32" 2.82 ++ mkdir -p "$(DESTDIR)/$(tccdir)/win32/lib/64" 2.83 + ifeq ($(ARCH),x86-64) 2.84 +- mkdir -p "$(tccdir)/i386" 2.85 +- $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386" 2.86 +- cp -r "$(tccdir)/include" "$(tccdir)/i386" 2.87 ++ mkdir -p "$(DESTDIR)/$(tccdir)/i386" 2.88 ++ $(INSTALL) -m644 lib/i386/libtcc1.a "$(DESTDIR)/$(tccdir)/i386" 2.89 ++ cp -r "$(tccdir)/include" "$(DESTDIR)/$(tccdir)/i386" 2.90 + endif 2.91 +- $(INSTALL) -m644 win32/lib/*.def "$(tccdir)/win32/lib" 2.92 +- $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32" 2.93 +- $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/win32/lib/64" 2.94 +- cp -r win32/include/. "$(tccdir)/win32/include" 2.95 +- cp -r include/. "$(tccdir)/win32/include" 2.96 ++ $(INSTALL) -m644 win32/lib/*.def "$(DESTDIR)/$(tccdir)/win32/lib" 2.97 ++ $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/win32/lib/32" 2.98 ++ $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/win32/lib/64" 2.99 ++ cp -r win32/include/. "$(DESTDIR)/$(tccdir)/win32/include" 2.100 ++ cp -r include/. "$(DESTDIR)/$(tccdir)/win32/include" 2.101 + endif 2.102 2.103 uninstall: 2.104 - rm -fv $(foreach P,$(PROGS),"$(bindir)/$P") 2.105 -- rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(tccdir)/$P") 2.106 +- rm -fv $(foreach P,$(LIBTCC1),"$(tccdir)/$P") 2.107 - rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P") 2.108 -- rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" 2.109 -- rm -fv "$(libdir)/libtcc.a" "$(includedir)/libtcc.h" 2.110 +- rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" "$(infodir)/tcc-doc.info" 2.111 +- rm -fv "$(libdir)/$(LIBTCC)" "$(includedir)/libtcc.h" 2.112 +- rm -fv "$(libdir)/libtcc.so*" 2.113 +- rm -rf "$(tccdir)/win32" 2.114 +- -rmdir $(tccdir)/include 2.115 + rm -fv $(foreach P,$(PROGS),"$(DESTDIR)/$(bindir)/$P") 2.116 -+ rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(DESTDIR)/$(tccdir)/$P") 2.117 ++ rm -fv $(foreach P,$(LIBTCC1),"$(DESTDIR)/$(tccdir)/$P") 2.118 + rm -fv $(foreach P,$(TCC_INCLUDES),"$(DESTDIR)/$(tccdir)/include/$P") 2.119 -+ rm -fv "$(docdir)/tcc-doc.html" "$(DESTDIR)/$(mandir)/man1/tcc.1" 2.120 -+ rm -fv "$(libdir)/libtcc.a" "$(DESTDIR)/$(includedir)/libtcc.h" 2.121 - 2.122 ++ rm -fv "$(DESTDIR)/$(docdir)/tcc-doc.html" "$(DESTDIR)/$(mandir)/man1/tcc.1" "$(DESTDIR)/$(infodir)/tcc-doc.info" 2.123 ++ rm -fv "$(DESTDIR)/$(libdir)/$(LIBTCC)" "$(DESTDIR)/$(includedir)/libtcc.h" 2.124 ++ rm -fv "$(DESTDIR)/$(libdir)/libtcc.so*" 2.125 ++ rm -rf "$(DESTDIR)/$(tccdir)/win32" 2.126 ++ -rmdir $(DESTDIR)/$(tccdir)/include 2.127 + ifeq ($(ARCH),x86-64) 2.128 +- rm -rf "$(tccdir)/i386" 2.129 ++ rm -rf "$(DESTDIR)/$(tccdir)/i386" 2.130 + endif 2.131 else 2.132 - install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html 2.133 + # on windows 2.134 + install: $(PROGS) $(TCCLIBS) $(TCCDOCS) 2.135 - mkdir -p "$(tccdir)" 2.136 - mkdir -p "$(tccdir)/lib" 2.137 - mkdir -p "$(tccdir)/include" 2.138 - mkdir -p "$(tccdir)/examples" 2.139 - mkdir -p "$(tccdir)/doc" 2.140 - mkdir -p "$(tccdir)/libtcc" 2.141 -- $(INSTALL) -s -m755 $(PROGS) "$(tccdir)" 2.142 +- $(INSTALLBIN) -m755 $(PROGS) "$(tccdir)" 2.143 - $(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(tccdir)/lib" 2.144 - cp -r win32/include/. "$(tccdir)/include" 2.145 - cp -r win32/examples/. "$(tccdir)/examples" 2.146 --# $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" 2.147 +- $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" 2.148 - $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(tccdir)/doc" 2.149 -- $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc" 2.150 +- $(INSTALL) -m644 $(LIBTCC) libtcc.h "$(tccdir)/libtcc" 2.151 + mkdir -p "$(DESTDIR)/$(tccdir)" 2.152 + mkdir -p "$(DESTDIR)/$(tccdir)/lib" 2.153 + mkdir -p "$(DESTDIR)/$(tccdir)/include" 2.154 + mkdir -p "$(DESTDIR)/$(tccdir)/examples" 2.155 + mkdir -p "$(DESTDIR)/$(tccdir)/doc" 2.156 + mkdir -p "$(DESTDIR)/$(tccdir)/libtcc" 2.157 -+ $(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(tccdir)" 2.158 ++ $(INSTALLBIN) -m755 $(PROGS) "$(DESTDIR)/$(tccdir)" 2.159 + $(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(DESTDIR)/$(tccdir)/lib" 2.160 + cp -r win32/include/. "$(DESTDIR)/$(tccdir)/include" 2.161 + cp -r win32/examples/. "$(DESTDIR)/$(tccdir)/examples" 2.162 -+# $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 2.163 ++ $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 2.164 + $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(DESTDIR)/$(tccdir)/doc" 2.165 -+ $(INSTALL) -m644 libtcc.a libtcc.h "$(DESTDIR)/$(tccdir)/libtcc" 2.166 ++ $(INSTALL) -m644 $(LIBTCC) libtcc.h "$(DESTDIR)/$(tccdir)/libtcc" 2.167 + ifdef CONFIG_CROSS 2.168 +- mkdir -p "$(tccdir)/lib/32" 2.169 +- mkdir -p "$(tccdir)/lib/64" 2.170 +- -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/lib/32" 2.171 +- -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/lib/64" 2.172 ++ mkdir -p "$(DESTDIR)/$(tccdir)/lib/32" 2.173 ++ mkdir -p "$(DESTDIR)/$(tccdir)/lib/64" 2.174 ++ -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/lib/32" 2.175 ++ -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/lib/64" 2.176 + endif 2.177 + 2.178 + uninstall: 2.179 +- rm -rfv "$(tccdir)/*" 2.180 ++ rm -rfv "$(DESTDIR)/$(tccdir)/*" 2.181 endif 2.182 2.183 # documentation and man page