diff options
| -rw-r--r-- | development/tcc/makefile_destdir.patch | 97 | ||||
| -rw-r--r-- | development/tcc/slack-desc | 2 | ||||
| -rw-r--r-- | development/tcc/tcc.SlackBuild | 36 | ||||
| -rw-r--r-- | development/tcc/tcc.info | 10 |
4 files changed, 19 insertions, 126 deletions
diff --git a/development/tcc/makefile_destdir.patch b/development/tcc/makefile_destdir.patch deleted file mode 100644 index 8d62c94214da..000000000000 --- a/development/tcc/makefile_destdir.patch +++ /dev/null @@ -1,97 +0,0 @@ -Index: tcc-0.9.25/Makefile -=================================================================== ---- tcc-0.9.25.orig/Makefile -+++ tcc-0.9.25/Makefile -@@ -13,6 +13,10 @@ ifneq ($(GCC_MAJOR),2) - CFLAGS+=-fno-strict-aliasing - endif - -+ifndef ($(DESTDIR)) -+DESTDIR = / -+endif -+ - ifeq ($(ARCH),i386) - CFLAGS+=-mpreferred-stack-boundary=2 - ifeq ($(GCC_MAJOR),2) -@@ -197,48 +201,48 @@ INSTALL=install - - ifndef CONFIG_WIN32 - install: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc.1 tcc-doc.html -- mkdir -p "$(bindir)" -- $(INSTALL) -s -m755 $(PROGS) "$(bindir)" -- mkdir -p "$(mandir)/man1" -- $(INSTALL) tcc.1 "$(mandir)/man1" -- mkdir -p "$(tccdir)" -- mkdir -p "$(tccdir)/include" -+ mkdir -p "$(DESTDIR)/$(bindir)" -+ $(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(bindir)" -+ mkdir -p "$(DESTDIR)/$(mandir)/man1" -+ $(INSTALL) tcc.1 "$(DESTDIR)/$(mandir)/man1" -+ mkdir -p "$(DESTDIR)/$(tccdir)" -+ mkdir -p "$(DESTDIR)/$(tccdir)/include" - ifneq ($(LIBTCC1),) -- $(INSTALL) -m644 $(LIBTCC1) "$(tccdir)" -+ $(INSTALL) -m644 $(LIBTCC1) "$(DESTDIR)/$(tccdir)" - endif - ifneq ($(BCHECK_O),) -- $(INSTALL) -m644 $(BCHECK_O) "$(tccdir)" -+ $(INSTALL) -m644 $(BCHECK_O) "$(DESTDIR)/$(tccdir)" - endif -- $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" -- mkdir -p "$(docdir)" -- $(INSTALL) -m644 tcc-doc.html "$(docdir)" -- mkdir -p "$(libdir)" -- $(INSTALL) -m644 libtcc.a "$(libdir)" -- mkdir -p "$(includedir)" -- $(INSTALL) -m644 libtcc.h "$(includedir)" -+ $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" -+ mkdir -p "$(DESTDIR)/$(docdir)" -+ $(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)" -+ mkdir -p "$(DESTDIR)/$(libdir)" -+ $(INSTALL) -m644 libtcc.a "$(DESTDIR)/$(libdir)" -+ mkdir -p "$(DESTDIR)/$(includedir)" -+ $(INSTALL) -m644 libtcc.h "$(DESTDIR)/$(includedir)" - - uninstall: -- rm -fv $(foreach P,$(PROGS),"$(bindir)/$P") -- rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(tccdir)/$P") -- rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P") -- rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" -- rm -fv "$(libdir)/libtcc.a" "$(includedir)/libtcc.h" -+ rm -fv $(foreach P,$(PROGS),"$(DESTDIR)/$(bindir)/$P") -+ rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(DESTDIR)/$(tccdir)/$P") -+ rm -fv $(foreach P,$(TCC_INCLUDES),"$(DESTDIR)/$(tccdir)/include/$P") -+ rm -fv "$(DESTDIR)/$(docdir)/tcc-doc.html" "$(DESTDIR)/$(mandir)/man1/tcc.1" -+ rm -fv "$(DESTDIR)/$(libdir)/libtcc.a" "$(includedir)/libtcc.h" - - else - install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html -- mkdir -p "$(tccdir)" -- mkdir -p "$(tccdir)/lib" -- mkdir -p "$(tccdir)/include" -- mkdir -p "$(tccdir)/examples" -- mkdir -p "$(tccdir)/doc" -- mkdir -p "$(tccdir)/libtcc" -- $(INSTALL) -s -m755 $(PROGS) "$(tccdir)" -- $(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(tccdir)/lib" -- cp -r win32/include/. "$(tccdir)/include" -- cp -r win32/examples/. "$(tccdir)/examples" --# $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" -- $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(tccdir)/doc" -- $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc" -+ mkdir -p "$(DESTDIR)/$(tccdir)" -+ mkdir -p "$(DESTDIR)/$(tccdir)/lib" -+ mkdir -p "$(DESTDIR)/$(tccdir)/include" -+ mkdir -p "$(DESTDIR)/$(tccdir)/examples" -+ mkdir -p "$(DESTDIR)/$(tccdir)/doc" -+ mkdir -p "$(DESTDIR)/$(tccdir)/libtcc" -+ $(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(tccdir)" -+ $(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(DESTDIR)/$(tccdir)/lib" -+ cp -r win32/include/. "$(DESTDIR)/$(tccdir)/include" -+ cp -r win32/examples/. "$(DESTDIR)/$(tccdir)/examples" -+# $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" -+ $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(DESTDIR)/$(tccdir)/doc" -+ $(INSTALL) -m644 libtcc.a libtcc.h "$(DESTDIR)/$(tccdir)/libtcc" - endif - - # documentation and man page diff --git a/development/tcc/slack-desc b/development/tcc/slack-desc index 33289a88f17d..56b7414bca0e 100644 --- a/development/tcc/slack-desc +++ b/development/tcc/slack-desc @@ -15,5 +15,5 @@ tcc: TCC supports ANSI C and most of ISO C99 and many GNUC extensions, tcc: including inline assembly. tcc was written by Fabrice Bellard and is tcc: distributed under the GNU Lesser General Public License. tcc: -tcc: Homepage: http://bellard.org/tcc/ +tcc: Homepage: http://www.tinycc.org/ tcc: diff --git a/development/tcc/tcc.SlackBuild b/development/tcc/tcc.SlackBuild index e463f85bed03..9536faef4062 100644 --- a/development/tcc/tcc.SlackBuild +++ b/development/tcc/tcc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tiny c compiler -# Copyright (c) 2010,2011 Markus Reichelt, Aachen, DE +# Copyright (c) 2010-2013 Markus Reichelt, Stolberg (Rhld), DE # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -23,14 +23,12 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 +# Markus Reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 # in memoriam of Georg Ohler -# 2010 Aug 23 - initial release -# 2011 Oct 30 - incorporated fixes & Makefile patch from Vincent Batts PRGNAM=tcc -VERSION=${VERSION:-0.9.25} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.26} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -80,8 +78,6 @@ if [ "$CROSS" = "yes" ]; then else OPT="" fi -cat $CWD/makefile_destdir.patch | patch -p1 --backup - mkdir -p $PKG/usr/bin $PKG/usr/man/man1 $PKG/usr/doc $PKG/usr/include DFLAGS=$LDFLAGS \ @@ -89,28 +85,22 @@ CFLAGS=$SLKCFLAGS \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ - --tccdir=/usr/lib$LIBDIRSUFFIX/tcc \ - --docdir=/usr/doc $OPT - -if [ "$ARCH" = "x86_64" ] ; then - sed -i 's/lib/lib64/' config.h - sed -i 's/lib\//lib64\//' config.mak -fi + --sharedir=/usr $OPT make -#make test # this fails on x86_64 -make install \ - DESTDIR=$PKG \ - tccdir=/usr/lib${LIBDIRSUFFIX}/tcc \ - docdir=/usr/doc/$PRGNAM-$VERSION +make test +make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man/man1 -type f -exec gzip -9 {} \; +gzip -9 $PKG/usr/man/man1/*.1 +gzip -9 $PKG/usr/info/*.info mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a README* Changelog* COPYING TODO $PKG/usr/doc/$PRGNAM-$VERSION + +mv $PKG/usr/doc/tcc/*.html $PKG/usr/doc/$PRGNAM-$VERSION +rmdir $PKG/usr/doc/tcc/ +cp -a README* Changelog* COPYING TODO examples/ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/development/tcc/tcc.info b/development/tcc/tcc.info index 0aa6e59e8fb0..8f30066ea88e 100644 --- a/development/tcc/tcc.info +++ b/development/tcc/tcc.info @@ -1,10 +1,10 @@ PRGNAM="tcc" -VERSION="0.9.25" -HOMEPAGE="http://bellard.org/tcc/" -DOWNLOAD="http://download.savannah.nongnu.org/releases/tinycc/tcc-0.9.25.tar.bz2" -MD5SUM="991c2a1986cce15f03ca6ddc86ea5f43" +VERSION="0.9.26" +HOMEPAGE="http://www.tinycc.org/" +DOWNLOAD="http://download.savannah.nongnu.org/releases/tinycc/tcc-0.9.26.tar.bz2" +MD5SUM="5fb28e4abc830c46a7f54c1f637fb25d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="markus reichelt" +MAINTAINER="Markus Reichelt" EMAIL="slackbuilds@mareichelt.de" |