Skip to content

Commit 08e6328

Browse files
[FIX][Vips]
1 parent 36dfae8 commit 08e6328

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ else
143143
# Removing caches
144144
rm -rf pkgs/apps/bodytrack/src/autom4te.cache/
145145

146+
# Removing VIPS old file (is needed otherwise will not compile the new version).
147+
rm -rf pkgs/apps/vips/src/libvips/iofuncs/threadpool.c
148+
146149
# Clean
147150
mv README README_PARSEC
148151
echo "Download succeeded."

parsec-ff/pkgs/apps/vips/parsec/gcc-ff.bldconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
build_deps="glib libxml2 zlib"
1919

2020
# Environment to use for configure script and Makefile
21-
build_env="CXXFLAGS=\"-I${PARSECDIR}/pkgs/libs/glib/inst/${PARSECPLAT}/include -I${PARSECDIR}/pkgs/libs/zlib/inst/${PARSECPLAT}/include ${CXXFLAGS} -fexceptions -DFF_VERSION\" LDFLAGS=\"-L${PARSECDIR}/pkgs/libs/glib/inst/${PARSECPLAT}/lib -L${PARSECDIR}/pkgs/libs/zlib/inst/${PARSECPLAT}/lib ${LDFLAGS}\" PKG_CONFIG_PATH=\"${PARSECDIR}/pkgs/libs/glib/inst/${PARSECPLAT}/lib/pkgconfig:${PARSECDIR}/pkgs/libs/libxml2/inst/${PARSECPLAT}/lib/pkgconfig:${PKG_CONFIG_PATH}\" LIBS=\"${LIBS} -lstdc++\""
21+
build_env="CXXFLAGS=\"-I${PARSECDIR}/pkgs/libs/glib/inst/${PARSECPLAT}/include -I${PARSECDIR}/pkgs/libs/zlib/inst/${PARSECPLAT}/include ${CXXFLAGS} -fexceptions\" LDFLAGS=\"-L${PARSECDIR}/pkgs/libs/glib/inst/${PARSECPLAT}/lib -L${PARSECDIR}/pkgs/libs/zlib/inst/${PARSECPLAT}/lib ${LDFLAGS}\" PKG_CONFIG_PATH=\"${PARSECDIR}/pkgs/libs/glib/inst/${PARSECPLAT}/lib/pkgconfig:${PARSECDIR}/pkgs/libs/libxml2/inst/${PARSECPLAT}/lib/pkgconfig:${PKG_CONFIG_PATH}\" LIBS=\"${LIBS} -lstdc++\""
2222

2323
# Whether the build system supports only in-place compilation.
2424
# If TRUE, then all sources will be copied to the build directory before we

parsec-ff/pkgs/apps/vips/src/configure.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,14 +277,13 @@ fi
277277
AC_ARG_ENABLE(fastflow,
278278
AS_HELP_STRING([--enable-ff], [evaluate with FastFlow (default: no)]))
279279

280-
if test x"$enable_ff" = x"yes"; then
280+
if test x"$enable_ff" = "xyes"; then
281281
AC_DEFINE(HAVE_FF,1,[FastFlow evaluation])
282282
enable_ff=yes
283283
else
284284
enable_ff=no
285285
fi
286286

287-
288287
# check for gtk-doc
289288
GTK_DOC_CHECK(1.9)
290289

parsec-ff/pkgs/apps/vips/src/libvips/iofuncs/threadpool.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ vips_thread_main_loop( void *a )
568568
/* Attach another thread to a threadpool.
569569
*/
570570
static VipsThread *
571-
vips_thread_new( VipsThreadpool *pool )
571+
vips_thread_new( VipsThreadpool *pool)
572572
{
573573
VipsThread *thr;
574574

@@ -917,7 +917,7 @@ vips_threadpool_run( VipsImage *im,
917917
workers.push_back(new Worker(pool));
918918
}
919919
ff::ff_farm<> farm(workers, new Emitter(), new Collector(pool, progress));
920-
(Emitter*) farm.getEmitter()->_lb = farm.getlb();
920+
((Emitter*) farm.getEmitter())->_lb = farm.getlb();
921921
farm.run_and_wait_end();
922922
/* Return 0 for success.
923923
*/

0 commit comments

Comments
 (0)