Commit 4d1ea771 authored by Ole Streicher's avatar Ole Streicher

Adjust patches for new version. Remove obsolete add_cppflags and use-std-paths-for-cpl

parent a1fc1561
Author: Ole Streicher <olebole@debian.org>
Description: Dont replace CPPFLAGS, but add to them
--- a/visir/Makefile.am
+++ b/visir/Makefile.am
@@ -30,7 +30,7 @@
endif
-CPPFLAGS = -DCX_LOG_DOMAIN=\"VisirLib\"
+CPPFLAGS += -DCX_LOG_DOMAIN=\"VisirLib\"
INCLUDES = $(all_includes)
......@@ -2,7 +2,7 @@ Author: Ole Streicher <olebole@debian.org>
Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
--- a/irplib/tests/irplib_polynomial-test.c
+++ b/irplib/tests/irplib_polynomial-test.c
@@ -560,16 +560,16 @@
@@ -567,16 +567,16 @@
const double root = cpl_vector_get(roots, i);
const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
......
This diff is collapsed.
libadd_cpl.patch
set_plugindir.patch
use-std-paths-for-cpl.patch
fix_test_fail.patch
force-serial-tests.patch
add_cppflags.patch
Author: Ole Streicher <olebole@debian.org>
Description: Use standard path and name for cpl
--- a/m4macros/cpl.m4
+++ b/m4macros/cpl.m4
@@ -41,7 +41,7 @@
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl_macros.h"
- cpl_check_cpl_lib="libcplcore.la"
+ cpl_check_cpl_lib="libcplcore.so"
cpl_includes=""
cpl_libraries=""
@@ -97,6 +97,7 @@
cpl_libdirs="/opt/cpl/lib \
/usr/local/lib \
/usr/local/cpl/lib \
+ /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
/usr/lib"
test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment