[FIX][Vips]

ParaGroup · Sep 28, 2017 · 08e6328 · 08e6328
1 parent 36dfae8
commit 08e6328
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/install.sh b/install.sh
@@ -143,6 +143,9 @@ else
     # Removing caches
     rm -rf pkgs/apps/bodytrack/src/autom4te.cache/
 
+    # Removing VIPS old file (is needed otherwise will not compile the new version).
+    rm -rf pkgs/apps/vips/src/libvips/iofuncs/threadpool.c
+
 	# Clean
 	mv README README_PARSEC
 	echo "Download succeeded."

diff --git a/parsec-ff/pkgs/apps/vips/parsec/gcc-ff.bldconf b/parsec-ff/pkgs/apps/vips/parsec/gcc-ff.bldconf
@@ -18,7 +18,7 @@
 build_deps="glib libxml2 zlib"
 
 # Environment to use for configure script and Makefile
-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++\""
+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++\""
 
 # Whether the build system supports only in-place compilation.
 # If TRUE, then all sources will be copied to the build directory before we

diff --git a/parsec-ff/pkgs/apps/vips/src/configure.in b/parsec-ff/pkgs/apps/vips/src/configure.in
@@ -277,14 +277,13 @@ fi
 AC_ARG_ENABLE(fastflow, 
   AS_HELP_STRING([--enable-ff], [evaluate with FastFlow (default: no)]))
 
-if test x"$enable_ff" = x"yes"; then
+if test x"$enable_ff" = "xyes"; then
   AC_DEFINE(HAVE_FF,1,[FastFlow evaluation])
   enable_ff=yes
 else
   enable_ff=no
 fi
 
-
 # check for gtk-doc
 GTK_DOC_CHECK(1.9)
 

diff --git a/parsec-ff/pkgs/apps/vips/src/libvips/iofuncs/threadpool.cc b/parsec-ff/pkgs/apps/vips/src/libvips/iofuncs/threadpool.cc
@@ -568,7 +568,7 @@ vips_thread_main_loop( void *a )
 /* Attach another thread to a threadpool.
  */
 static VipsThread *
-vips_thread_new( VipsThreadpool *pool )
+vips_thread_new( VipsThreadpool *pool)
 {
 	VipsThread *thr;
 
@@ -917,7 +917,7 @@ vips_threadpool_run( VipsImage *im,
         workers.push_back(new Worker(pool));
     }
     ff::ff_farm<> farm(workers, new Emitter(), new Collector(pool, progress));
-    (Emitter*) farm.getEmitter()->_lb = farm.getlb();
+    ((Emitter*) farm.getEmitter())->_lb = farm.getlb();
     farm.run_and_wait_end();
 	/* Return 0 for success.
 	 */