diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | autopatch.diff | 13 | ||||
-rw-r--r-- | gcc-4.6.4-disable_texinfo.diff | 24 |
4 files changed, 71 insertions, 14 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Oct 23 18:47:29 UTC 2016 +# Thu Nov 10 20:30:07 UTC 2016 pkgbase = codeviz pkgdesc = A call graph generation utility for C/C++ pkgver = 1.0.12 - pkgrel = 1 + pkgrel = 2 url = https://github.com/petersenna/codeviz install = codeviz.install arch = i686 @@ -13,10 +13,14 @@ pkgbase = codeviz depends = graphviz noextract = gcc-4.6.4.tar.gz options = !buildflags - source = https://github.com/petersenna/codeviz/archive/8e597959959c4e812742e9d68c1ea4c4db63a39d.zip + source = codeviz-1.0.12.tar.gz::https://github.com/petersenna/codeviz/archive/8e597959959c4e812742e9d68c1ea4c4db63a39d.tar.gz source = ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.gz - md5sums = 5538e066a1c18fd7d49bfe8a9df92e68 + source = autopatch.diff + source = gcc-4.6.4-disable_texinfo.diff + md5sums = d74dbb67020f3508e9a75e22486bc443 md5sums = a8f15fc233589924ccd8cc8140b0ca3c + md5sums = e7065b30ef76518d3e8936b124289da4 + md5sums = 37f408fb79cd87f15d1a0fa4574e29c8 pkgname = codeviz @@ -3,7 +3,7 @@ pkgname=codeviz pkgver=1.0.12 _pkgver=8e597959959c4e812742e9d68c1ea4c4db63a39d _gccver=4.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="A call graph generation utility for C/C++" arch=('i686' 'x86_64') url="https://github.com/petersenna/codeviz" @@ -12,12 +12,33 @@ depends=('perl' 'graphviz') # unset the C(XX)FLAGS because they would break the compilation if they contained # options not supported in $_gccver options=('!buildflags') -source=("https://github.com/petersenna/codeviz/archive/$_pkgver.zip" - ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$_gccver/gcc-${_gccver}.tar.gz) +source=("$pkgname-$pkgver.tar.gz::https://github.com/petersenna/codeviz/archive/$_pkgver.tar.gz" + ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$_gccver/gcc-${_gccver}.tar.gz + autopatch.diff gcc-$_gccver-disable_texinfo.diff) noextract=(gcc-${_gccver}.tar.gz) install=codeviz.install -md5sums=('5538e066a1c18fd7d49bfe8a9df92e68' - 'a8f15fc233589924ccd8cc8140b0ca3c') +md5sums=('d74dbb67020f3508e9a75e22486bc443' + 'a8f15fc233589924ccd8cc8140b0ca3c' + 'e7065b30ef76518d3e8936b124289da4' + '37f408fb79cd87f15d1a0fa4574e29c8') + +prepare() { + cd "$srcdir/$pkgname-$_pkgver" + + # modify the script for building gcc to automatically apply patches + patch -Np1 < "$srcdir/autopatch.diff" + + # add patch to disable building of documentation + ln -sf "$srcdir/gcc-$_gccver-disable_texinfo.diff" compilers/gcc-patches/ + + # update for gcc 4.6.4 instead of 4.6.2 + find . -type f -exec sed -i 's|4\.6\.2|4\.6\.4|g' '{}' ';' + mv compilers/install_gcc-4.6.2.sh compilers/install_gcc-${_gccver}.sh + mv compilers/gcc-patches/gcc-4.6.2-cdepn.diff compilers/gcc-patches/gcc-${_gccver}-cdepn.diff + + # link the downloaded sources so the configure script doesn't download them again + ln -sf "$SRCDEST/gcc-${_gccver}.tar.gz" compilers/gcc-${_gccver}.tar.gz +} build() { cd "$srcdir/$pkgname-$_pkgver" @@ -30,11 +51,6 @@ build() { CXXFLAGS=${CXXFLAGS//-fstack-protector-strong/-fstack-protector} export CXXFLAGS - # update for gcc 4.6.4 instead of 4.6.2 - find . -type f -exec sed -i 's|4\.6\.2|4\.6\.4|g' '{}' ';' - mv compilers/install_gcc-4.6.2.sh compilers/install_gcc-${_gccver}.sh - mv compilers/gcc-patches/gcc-4.6.2-cdepn.diff compilers/gcc-patches/gcc-${_gccver}-cdepn.diff - # link the downloaded sources so the configure script doesn't download them again ln -sf "$SRCDEST/gcc-${_gccver}.tar.gz" compilers/gcc-${_gccver}.tar.gz diff --git a/autopatch.diff b/autopatch.diff new file mode 100644 index 000000000000..b32bb6b625d1 --- /dev/null +++ b/autopatch.diff @@ -0,0 +1,13 @@ +--- codeviz-8e597959959c4e812742e9d68c1ea4c4db63a39d/compilers/install_gcc-4.6.2.sh 2015-07-23 15:37:43.000000000 +0200 ++++ codeviz-8e597959959c4e812742e9d68c1ea4c4db63a39d.new/compilers/install_gcc-4.6.4.sh 2016-11-10 11:25:18.931139114 +0100 +@@ -28,7 +28,9 @@ tar -zxf gcc-4.6.2.tar.gz -C gcc-graph | + + # Apply patch + cd gcc-graph/gcc-4.6.2 +-patch -p1 < ../../gcc-patches/gcc-4.6.2-cdepn.diff ++for PATCH in ../../gcc-patches/gcc-4.6.2-*.diff ; do ++ patch -p1 < $PATCH ++done + cd ../objdir + + # Configure and compile diff --git a/gcc-4.6.4-disable_texinfo.diff b/gcc-4.6.4-disable_texinfo.diff new file mode 100644 index 000000000000..e5373d6358e8 --- /dev/null +++ b/gcc-4.6.4-disable_texinfo.diff @@ -0,0 +1,24 @@ +diff -rup gcc-4.6.4/gcc/Makefile.in gcc-4.6.4.new/gcc/Makefile.in +--- gcc-4.6.4/gcc/Makefile.in 2013-04-01 10:32:34.000000000 +0200 ++++ gcc-4.6.4.new/gcc/Makefile.in 2016-11-10 11:00:52.771345965 +0100 +@@ -4261,18 +4261,10 @@ doc/gcc.info: $(TEXI_GCC_FILES) + doc/gccint.info: $(TEXI_GCCINT_FILES) + doc/cppinternals.info: $(TEXI_CPPINT_FILES) + +-doc/%.info: %.texi +- if [ x$(BUILD_INFO) = xinfo ]; then \ +- $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ +- -I $(gcc_docdir)/include -o $@ $<; \ +- fi ++doc/%.info: + + # Duplicate entry to handle renaming of gccinstall.info +-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) +- if [ x$(BUILD_INFO) = xinfo ]; then \ +- $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \ +- -I $(gcc_docdir)/include -o $@ $<; \ +- fi ++doc/gccinstall.info: + + doc/cpp.dvi: $(TEXI_CPP_FILES) + doc/gcc.dvi: $(TEXI_GCC_FILES) |