[Debian-med-packaging] Bug#746863: FTBFS src:insighttoolkit4
Gianfranco Costamagna
costamagnagianfranco at yahoo.it
Wed Jul 16 16:41:40 UTC 2014
Hi Andreas and all,
This is the gccxml debdiff already available on mentors.
I'm building both amd64 and i386 and the build is not over 71% without the failure.
In a few hours I'll tell if they both succeeded.
Sorry for the noise.
diff -Nru gccxml-0.9.0+git20140610/debian/changelog gccxml-0.9.0+git20140716/debian/changelog
--- gccxml-0.9.0+git20140610/debian/changelog 2014-07-01 20:38:52.000000000 +0200
+++ gccxml-0.9.0+git20140716/debian/changelog 2014-07-16 10:51:59.000000000 +0200
@@ -1,3 +1,20 @@
+gccxml (0.9.0+git20140716-1) unstable; urgency=medium
+
+ * Team upload.
+ [ Dmitry Shachnev ]
+ * Use dh_autotools-dev addon to update config.sub|guess.
+ (Closes: #753472)
+
+ [ Gianfranco Costamagna ]
+ * New upstream snapshot (Closes: #746863).
+ * Add get-orig-source target, to comply with policy.
+ * Bump std-version to 3.9.5, no changes required.
+ * Switch to tar.xz source tarballs.
+ * drop patches/stl_algo.patch, merged upstream.
+ * removing some prebuilt windows binaries.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 16 Jul 2014 10:06:17 +0200
+
gccxml (0.9.0+git20140610-2) unstable; urgency=medium
* patches/stl_algo.patch: New. Improve GCC 4.9 support.
diff -Nru gccxml-0.9.0+git20140610/debian/control gccxml-0.9.0+git20140716/debian/control
--- gccxml-0.9.0+git20140610/debian/control 2013-05-11 09:44:29.000000000 +0200
+++ gccxml-0.9.0+git20140716/debian/control 2014-07-16 10:49:00.000000000 +0200
@@ -2,12 +2,12 @@
Section: devel
Priority: optional
Maintainer: Steve M. Robbins <smr at debian.org>
-Build-Depends: debhelper (>= 9), cmake
+Build-Depends: debhelper (>= 9), cmake, autotools-dev
Build-Conflicts: ccache
Homepage: http://www.gccxml.org/
Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/gccxml/trunk/
-Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/gccxml/trunk
-Standards-Version: 3.9.3
+Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/gccxml/trunk
+Standards-Version: 3.9.5
Package: gccxml
Architecture: any
diff -Nru gccxml-0.9.0+git20140610/debian/makeSource.sh gccxml-0.9.0+git20140716/debian/makeSource.sh
--- gccxml-0.9.0+git20140610/debian/makeSource.sh 2014-06-11 04:58:09.000000000 +0200
+++ gccxml-0.9.0+git20140716/debian/makeSource.sh 2014-07-16 10:51:43.000000000 +0200
@@ -8,8 +8,9 @@
DATE=`date +%Y%m%d`
dirname=gccxml-${VERSION}+git${DATE}.orig
-tarname=gccxml_${VERSION}+git${DATE}.orig.tar.gz
+tarname=gccxml_${VERSION}+git${DATE}.orig.tar.xz
+echo "to run correctly this script needs the upstream git repository located in the ../upstream directory"
cd ../upstream
git pull
@@ -24,7 +25,14 @@
rm -rf ${dirname}/GCC_XML/Support/Borland
rm -f ${dirname}/GCC/libiberty/xatexit.c
+# Remove prebuilt windows binaries
+rm -rf ${dirname}/GCC/config_cmake/nawk.exe
+rm -rf ${dirname}/GCC_XML/VcInstall/vcCat.exe
+rm -rf ${dirname}/GCC_XML/VcInstall/vcPatch.exe
+
# Build tarball
#
-GZIP="--best --no-name" tar czf tarballs/${tarname} ${dirname}
+mkdir -p tarballs
+GZIP="--best --no-name" tar cfJ tarballs/${tarname} ${dirname}
rm -rf ${dirname}
+echo "your new package is located in ../tarballs/${tarname}"
diff -Nru gccxml-0.9.0+git20140610/debian/patches/series gccxml-0.9.0+git20140716/debian/patches/series
--- gccxml-0.9.0+git20140610/debian/patches/series 2014-07-01 20:38:06.000000000 +0200
+++ gccxml-0.9.0+git20140716/debian/patches/series 2014-07-16 10:16:21.000000000 +0200
@@ -1,3 +1,2 @@
01_remove-xatexit.diff
debian-tests
-stl_algo.patch
diff -Nru gccxml-0.9.0+git20140610/debian/patches/stl_algo.patch gccxml-0.9.0+git20140716/debian/patches/stl_algo.patch
--- gccxml-0.9.0+git20140610/debian/patches/stl_algo.patch 2014-07-01 20:43:10.000000000 +0200
+++ gccxml-0.9.0+git20140716/debian/patches/stl_algo.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-Description: Improve GCC 4.9 support
-Author: Steve Robbins <smr at debian.org>
-Forwarded: http://www.gccxml.org/Bug/view.php?id=14912
-
-Remove use of __decltype, not understood by the underlying gccxml parser.
-Contributes to FTBFS of ITK (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746863).
-
-diff --git a/GCC_XML/Support/GCC/4.9/bits/stl_algo.h b/GCC_XML/Support/GCC/4.9/bits/stl_algo.h
-index 329dbe3..f7d3396 100644
---- a/GCC_XML/Support/GCC/4.9/bits/stl_algo.h
-+++ b/GCC_XML/Support/GCC/4.9/bits/stl_algo.h
-@@ -1082,12 +1082,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
- typename iterator_traits<_InputIterator>::value_type>)
-
- typename iterator_traits<_InputIterator>::value_type __value = *__first;
-- __decltype(__gnu_cxx::__ops::__iter_comp_val(__binary_pred))
-- __rebound_pred
-- = __gnu_cxx::__ops::__iter_comp_val(__binary_pred);
- *__result = __value;
- while (++__first != __last)
-- if (!__rebound_pred(__first, __value))
-+ if (!__binary_pred(__first, __value))
- {
- __value = *__first;
- *++__result = __value;
diff -Nru gccxml-0.9.0+git20140610/debian/rules gccxml-0.9.0+git20140716/debian/rules
--- gccxml-0.9.0+git20140610/debian/rules 2013-05-11 22:32:37.000000000 +0200
+++ gccxml-0.9.0+git20140716/debian/rules 2014-07-16 10:15:58.000000000 +0200
@@ -7,7 +7,7 @@
pkg_dev = libgccxml-dev
%:
- dh $@ --buildsystem=cmake --parallel
+ dh $@ --buildsystem=cmake --parallel --with=autotools-dev
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_FLAGS)
@@ -24,3 +24,6 @@
cp -a debian/Support/* GCC_XML/Support
dh_auto_build
+get-orig-source:
+ ./debian/makeSource.sh
+
diff -Nru gccxml-0.9.0+git20140610/GCC_XML/Support/GCC/4.9/bits/stl_algo.h gccxml-0.9.0+git20140716/GCC_XML/Support/GCC/4.9/bits/stl_algo.h
--- gccxml-0.9.0+git20140610/GCC_XML/Support/GCC/4.9/bits/stl_algo.h 2014-06-11 02:12:08.000000000 +0200
+++ gccxml-0.9.0+git20140716/GCC_XML/Support/GCC/4.9/bits/stl_algo.h 2014-07-16 10:02:08.000000000 +0200
@@ -1082,12 +1082,9 @@
typename iterator_traits<_InputIterator>::value_type>)
typename iterator_traits<_InputIterator>::value_type __value = *__first;
- __decltype(__gnu_cxx::__ops::__iter_comp_val(__binary_pred))
- __rebound_pred
- = __gnu_cxx::__ops::__iter_comp_val(__binary_pred);
*__result = __value;
while (++__first != __last)
- if (!__rebound_pred(__first, __value))
+ if (!__binary_pred(__first, __value))
{
__value = *__first;
*++__result = __value;
diff -Nru gccxml-0.9.0+git20140610/GCC_XML/VcInstall/CMakeLists.txt gccxml-0.9.0+git20140716/GCC_XML/VcInstall/CMakeLists.txt
--- gccxml-0.9.0+git20140610/GCC_XML/VcInstall/CMakeLists.txt 2013-05-11 09:24:13.000000000 +0200
+++ gccxml-0.9.0+git20140716/GCC_XML/VcInstall/CMakeLists.txt 2014-07-16 10:02:08.000000000 +0200
@@ -15,11 +15,10 @@
# Create the MSVC support directories.
# This will just execute on every build because we don't know
# what files and directories it may create.
-GET_TARGET_PROPERTY(GCCXML_VCCONFIG_EXE ${VCCONFIG_TARGET} LOCATION)
ADD_CUSTOM_COMMAND(
OUTPUT ${GCCXML_BINARY_DIR}/vcInstall_stamp.c
- COMMAND ${GCCXML_VCCONFIG_EXE}
+ COMMAND ${VCCONFIG_TARGET}
${GCCXML_SOURCE_DIR}/VcInstall ${GCCXML_BINARY_DIR}/Support
${GCCXML_BINARY_DIR}/vcInstall_stamp.c
Gianfranco
> Il Mercoledì 16 Luglio 2014 13:12, Andreas Tille <tille at debian.org> ha scritto:
> > On Wed, Jul 16, 2014 at 12:13:46PM +0200, Gert Wollny wrote:
>> On Tue, 2014-07-15 at 23:14 +0200, Andreas Tille wrote:
>> [...]
>> > I could do the sponsering if needed. Please confirm that
>> > debian/makeSource.sh really fetches the source you are working on.
>> > I also think *if* I would do the upload and nobody would beat me
>> > I would switch to xz compression for the original tarball.
>>
>> After the new gccxml package becomes available in sid I could do the
>> insighttoolkit4 upload.
>
> Does this mean: Yes, Andreas, please do the sponsering and is a
> confirmation that debian/makeSource.sh really fetches the source you are
> working on?
>
> Kind regards
>
> Andreas.
>
> --
> http://fam-tille.de
>
More information about the Debian-med-packaging
mailing list