Matthias Klose <[EMAIL PROTECTED]> wrote: > Package: gcc-avr > Version: 1:4.1.0-1 > Severity: serious > > see debian/rules.unpack in the gcc-4.1 source for a list, plus the > INSTALL directory needs to be removed.
I've tried to provide a patch that fixes this. I took the list of files from the gcc-4.1 package and wrote new Makefile snippet to "clean" the included tarballs. The patch is attached. However, after cleaning it this way, the build fails very early: dh_testdir mkdir objdir # Add here commands to configure the package. cd objdir && env CC=3D"gcc" ../build-tree/gcc-*/configure -v --enable-langu= ages=3Dc,c++ --prefix=3D/usr --infodir=3D/usr/share/i nfo --mandir=3D/usr/share/man --enable-shared --with-system-zlib --enable-l= ong-long --enable-nls --without-included-gettex t --disable-checking --disable-libssp --build=3Di486-linux-gnu --host=3Di48= 6-linux-gnu --target=3Davr=20=20 creating cache ./config.cache checking host system type... i486-pc-linux-gnu checking target system type... avr-unknown-none checking build system type... i486-pc-linux-gnu checking for a BSD compatible install... /usr/bin/install -c checking whether ln works... yes checking whether ln -s works... yes checking for gcc... gcc checking whether the C compiler (gcc ) works... yes checking whether the C compiler (gcc ) is a cross-compiler... no checking whether we are using GNU C... yes checking whether gcc accepts -g... yes checking for gnatbind... no checking whether compiler driver understands Ada... no checking how to compare bootstrapped objects... cmp --ignore-initial=3D16 $= $f1 $$f2 checking for correct version of gmp.h... no configure: error:=20 The following requested languages could not be built: c++ Recognised languages are: c,obj-c++,treelang It seems that some of the doc files are needed at build time (Which looks like a, err, GPL violation by the FSF, but probably the cause is something else). Regards, Frank -- Dr. Frank Küster Single Molecule Spectroscopy, Protein Folding @ Inst. f. Biochemie, Univ. Zürich Debian Developer (teTeX/TeXLive)
diff -Nur gcc-avr-4.1.0/debian/changelog gcc-avr-4.1.0.dfsg.1/debian/changelog --- gcc-avr-4.1.0/debian/changelog 2006-05-01 11:28:57.000000000 +0200 +++ gcc-avr-4.1.0.dfsg.1/debian/changelog 2007-03-12 15:37:56.000000000 +0100 @@ -1,3 +1,13 @@ +gcc-avr (1:4.1.0.dfsg.1-0.1) unstable; urgency=low + + * Add a makefile snippet to remove files from the tarballs that are + under GFDL and contain invariant sections. Thanks to Matthias Klose + for the list of files + * Let the clean target depend on the repack-gfdl target, and do the + cleaning (closes: #413216) + + -- Frank KÃŒster <[EMAIL PROTECTED]> Mon, 12 Mar 2007 15:37:56 +0100 + gcc-avr (1:4.1.0-1) unstable; urgency=low * Upstream release diff -Nur gcc-avr-4.1.0/debian/rules gcc-avr-4.1.0.dfsg.1/debian/rules --- gcc-avr-4.1.0/debian/rules 2006-05-01 11:51:57.000000000 +0200 +++ gcc-avr-4.1.0.dfsg.1/debian/rules 2007-03-12 15:37:03.000000000 +0100 @@ -41,6 +41,7 @@ TAR_DIR=gcc-* include /usr/share/dbs/dbs-build.mk +include debian/rules-gfdlstuff.mk #unpack: unpack-stamp #unpack-stamp: @@ -68,7 +69,7 @@ touch build-stamp -clean: +clean: repack-gfdl dh_testdir dh_testroot rm -f build-stamp configure-stamp diff -Nur gcc-avr-4.1.0/debian/rules-gfdlstuff.mk gcc-avr-4.1.0.dfsg.1/debian/rules-gfdlstuff.mk --- gcc-avr-4.1.0/debian/rules-gfdlstuff.mk 1970-01-01 01:00:00.000000000 +0100 +++ gcc-avr-4.1.0.dfsg.1/debian/rules-gfdlstuff.mk 2007-03-12 15:50:08.000000000 +0100 @@ -0,0 +1,120 @@ +# -*- makefile -*- +# uses information taken from the gcc-4.1 package + +gfdl_texinfo_files = \ + gcc/doc/bugreport.texi \ + gcc/doc/cfg.texi \ + gcc/doc/collect2.texi \ + gcc/doc/compat.texi \ + gcc/doc/configfiles.texi \ + gcc/doc/configterms.texi \ + gcc/doc/contrib.texi \ + gcc/doc/contribute.texi \ + gcc/doc/cppenv.texi \ + gcc/doc/cppinternals.texi \ + gcc/doc/cppopts.texi \ + gcc/doc/cpp.texi \ + gcc/doc/c-tree.texi \ + gcc/doc/extend.texi \ + gcc/doc/fragments.texi \ + gcc/doc/frontends.texi \ + gcc/doc/gccint.texi \ + gcc/doc/gcc.texi \ + gcc/doc/gcov.texi \ + gcc/doc/gnu.texi \ + gcc/doc/gty.texi \ + gcc/doc/headerdirs.texi \ + gcc/doc/hostconfig.texi \ + gcc/doc/implement-c.texi \ + gcc/doc/install-old.texi \ + gcc/doc/install.texi \ + gcc/doc/interface.texi \ + gcc/doc/invoke.texi \ + gcc/doc/languages.texi \ + gcc/doc/libgcc.texi \ + gcc/doc/makefile.texi \ + gcc/doc/md.texi \ + gcc/doc/objc.texi \ + gcc/doc/options.texi \ + gcc/doc/passes.texi \ + gcc/doc/portability.texi \ + gcc/doc/rtl.texi \ + gcc/doc/service.texi \ + gcc/doc/sourcebuild.texi \ + gcc/doc/standards.texi \ + gcc/doc/tm.texi \ + gcc/doc/tree-ssa.texi \ + gcc/doc/trouble.texi \ + gcc/doc/include/gcc-common.texi \ + gcc/doc/include/funding.texi \ + gcc/fortran/invoke.texi \ + gcc/fortran/intrinsic.texi \ + libstdc++-v3/docs/html/17_intro/porting.texi \ + +gfdl_toplevel_texinfo_files = \ + gcc/doc/gcc.texi \ + gcc/java/gcj.texi \ + gcc/ada/gnat-style.texi \ + gcc/ada/gnat_rm.texi \ + gcc/ada/gnat_ugn.texi \ + gcc/fortran/gfortran.texi \ + gcc/treelang/treelang.texi \ + +gfdl_manpages = \ + gcc/doc/cpp.1 \ + gcc/doc/g++.1 \ + gcc/doc/gcc.1 \ + gcc/doc/gcj.1 \ + gcc/doc/gcj-dbtool.1 \ + gcc/doc/gcjh.1 \ + gcc/doc/gcov.1 \ + gcc/doc/gij.1 \ + gcc/doc/gjnih.1 \ + gcc/doc/grmic.1 \ + gcc/doc/grmiregistry.1 \ + gcc/doc/jcf-dump.1 \ + gcc/doc/jv-convert.1 \ + gcc/doc/jv-scan.1 + +unpackedpath=build-tree/gcc-4.1.0 + +repack-gfdl: repack-gfdl-core repack-gfdl-g++ + +# core +repack-gfdl-core: unpack-core remove-gfdl-core + (cd core; tar -cjf ../gcc-core-4.1.0.tar.bz2 *) + rm -rf core + +core: unpack-core +unpack-core: + mkdir core + (cd core; tar -xjf ../gcc-core-4.1.0.tar.bz2) + +remove-gfdl-core: core + (cd core; $(remove-gfdl)) + rm -rf core/$(unpackedpath)/INSTALL + + +# g++ +repack-gfdl-g++: unpack-g++ remove-gfdl-g++ + (cd g++; tar -cjf ../gcc-g++-4.1.0.tar.bz2 *) + rm -rf g++ + +g++: unpack-g++ +unpack-g++: + mkdir g++ + (cd g++; tar -xjf ../gcc-g++-4.1.0.tar.bz2) + +remove-gfdl-g++: g++ + (cd g++; $(remove-gfdl)) + rm -rf g++/$(unpackedpath)/INSTALL + + + +define remove-gfdl + for file in $(gfdl_texinfo_files) $(gfdl_toplevel_texinfo_files) $(gfdl_manpages); do \ + rm -f $(unpackedpath)/$$file; \ + done +endef + +.PHONY: repack-gfdl Binary files gcc-avr-4.1.0/gcc-core-4.1.0.tar.bz2 and gcc-avr-4.1.0.dfsg.1/gcc-core-4.1.0.tar.bz2 differ Binary files gcc-avr-4.1.0/gcc-g++-4.1.0.tar.bz2 and gcc-avr-4.1.0.dfsg.1/gcc-g++-4.1.0.tar.bz2 differ
