Is this about GSL or Lorene? The subject indicates GSL, but the patch content contains "Lorene".
-erik On Tue, Apr 28, 2015 at 1:55 PM, <[email protected]> wrote: > User: rhaas > Date: 2015/04/28 03:55 PM > > Added: > /trunk/dist/ > patchtest.patch, stdarg.patch > > Modified: > /trunk/src/ > build.sh > > Log: > use stdarg.h rather than vararg.h > > File Changes: > > Directory: /trunk/dist/ > ======================= > > File [added]: patchtest.patch > Delta lines: +5 -0 > =================================================================== > --- trunk/dist/patchtest.patch (rev 0) > +++ trunk/dist/patchtest.patch 2015-04-28 20:55:21 UTC (rev 69) > @@ -0,0 +1,5 @@ > +diff --new-file -ru Lorene.orig/.patch_tmp Lorene/.patch_tmp > +--- Lorene.orig/.patch_tmp 1969-12-31 18:00:00.000000000 -0600 > ++++ Lorene/.patch_tmp 2010-06-24 19:43:15.000000000 -0500 > +@@ -0,0 +1 @@ > ++ > > File [added]: stdarg.patch > Delta lines: +13 -0 > =================================================================== > --- trunk/dist/stdarg.patch (rev 0) > +++ trunk/dist/stdarg.patch 2015-04-28 20:55:21 UTC (rev 69) > @@ -0,0 +1,13 @@ > +diff -ru gsl-1.16-orig/test/results.c gsl-1.16/test/results.c > +--- gsl-1.16-orig/test/results.c 2013-07-17 13:04:26.000000000 -0700 > ++++ gsl-1.16/test/results.c 2015-04-28 13:24:11.901318472 -0700 > +@@ -29,7 +29,7 @@ > + #ifdef STDC_HEADERS > + #include <stdarg.h> > + #else > +-#include <varargs.h> > ++#include <stdarg.h> > + #endif > + #endif > + > +Only in gsl-1.16/test: results.c~ > > Directory: /trunk/src/ > ====================== > > File [modified]: build.sh > Delta lines: +16 -0 > =================================================================== > --- trunk/src/build.sh 2014-12-06 16:00:10 UTC (rev 68) > +++ trunk/src/build.sh 2015-04-28 20:55:21 UTC (rev 69) > @@ -43,6 +43,22 @@ > echo "GSL: Unpacking archive..." > pushd ${BUILD_DIR} > ${TAR?} xzf ${SRCDIR}/../dist/${NAME}.tar.gz > +pushd ${NAME} > +${PATCH?} -p1 < ${SRCDIR}/../dist/stdarg.patch > +# Some (ancient but still used) versions of patch don't support the > +# patch format used here but also don't report an error using the exit > +# code. So we use this patch to test for this > +${PATCH?} -p1 < ${SRCDIR}/../dist/patchtest.patch > +if [ ! -e .patch_tmp ]; then > + echo 'BEGIN ERROR' > + echo 'The version of patch is too old to understand this patch > format.' > + echo 'Please set the PATCH environment variable to a more recent ' > + echo 'version of the patch command.' > + echo 'END ERROR' > + exit 1 > +fi > +rm -f .patch_tmp > +popd > > echo "GSL: Configuring..." > cd ${NAME} > > _______________________________________________ > Commits mailing list > [email protected] > http://cactuscode.org/mailman/listinfo/commits > -- Erik Schnetter <[email protected]> http://www.perimeterinstitute.ca/personal/eschnetter/
_______________________________________________ Users mailing list [email protected] http://cactuscode.org/mailman/listinfo/users
