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);
......
......@@ -5,28 +5,22 @@ Description: Add the cpl libraries to the recips.so and the test program
@@ -34,7 +34,7 @@
OBJDIR = $(top_builddir)/recipes/.libs
INCLUDES = $(all_includes)
-LDADD = $(LIBVISIR)
+LDADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLUI)
AM_CPPFLAGS = $(all_includes)
-LDADD = $(LIBVISIR) $(LIBCEXT)
+LDADD = $(LIBVISIR) $(LIBCEXT) $(LIBCPLCORE) $(LIBCPLUI)
pkginclude_HEADERS =
--- a/recipes/Makefile.am
+++ b/recipes/Makefile.am
@@ -62,121 +62,121 @@
visir_spc_wcal_ech.la
@@ -64,122 +64,122 @@
visir_spc_reduce.la
visir_img_combine_la_SOURCES = visir_recipe.h visir_img_combine.c
-visir_img_combine_la_LIBADD = $(LIBVISIR)
+visir_img_combine_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_img_combine_la_LDFLAGS = -module -avoid-version
visir_img_combine_la_DEPENDENCIES = $(LIBVISIR)
visir_img_burst_la_SOURCES = visir_recipe.h visir_img_burst.c
-visir_img_burst_la_LIBADD = $(LIBVISIR)
+visir_img_burst_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_img_burst_la_LDFLAGS = -module -avoid-version
visir_img_burst_la_DEPENDENCIES = $(LIBVISIR)
visir_old_img_combine_la_SOURCES = visir_recipe.h visir_img_combine.c
-visir_old_img_combine_la_LIBADD = $(LIBVISIR)
+visir_old_img_combine_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_img_combine_la_LDFLAGS = -module -avoid-version
visir_old_img_combine_la_DEPENDENCIES = $(LIBVISIR)
visir_img_dark_la_SOURCES = visir_recipe.h visir_img_dark.c
-visir_img_dark_la_LIBADD = $(LIBVISIR)
......@@ -46,47 +40,47 @@ Description: Add the cpl libraries to the recips.so and the test program
visir_img_trans_la_LDFLAGS = -module -avoid-version
visir_img_trans_la_DEPENDENCIES = $(LIBVISIR)
visir_img_phot_la_SOURCES = visir_recipe.h visir_img_phot.c
-visir_img_phot_la_LIBADD = $(LIBVISIR)
+visir_img_phot_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_img_phot_la_LDFLAGS = -module -avoid-version
visir_img_phot_la_DEPENDENCIES = $(LIBVISIR)
visir_spc_obs_la_SOURCES = visir_recipe.h visir_spc_obs.c
-visir_spc_obs_la_LIBADD = $(LIBVISIR)
+visir_spc_obs_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_spc_obs_la_LDFLAGS = -module -avoid-version
visir_spc_obs_la_DEPENDENCIES = $(LIBVISIR)
visir_spc_wcal_la_SOURCES = visir_recipe.h visir_spc_wcal.c
-visir_spc_wcal_la_LIBADD = $(LIBVISIR)
+visir_spc_wcal_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_spc_wcal_la_LDFLAGS = -module -avoid-version
visir_spc_wcal_la_DEPENDENCIES = $(LIBVISIR)
visir_spc_obs_ech_la_SOURCES = visir_recipe.h visir_spc_obs_ech.c
-visir_spc_obs_ech_la_LIBADD = $(LIBVISIR)
+visir_spc_obs_ech_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_spc_obs_ech_la_LDFLAGS = -module -avoid-version
visir_spc_obs_ech_la_DEPENDENCIES = $(LIBVISIR)
visir_spc_wcal_ech_la_SOURCES = visir_recipe.h visir_spc_wcal_ech.c
-visir_spc_wcal_ech_la_LIBADD = $(LIBVISIR)
+visir_spc_wcal_ech_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_spc_wcal_ech_la_LDFLAGS = -module -avoid-version
visir_spc_wcal_ech_la_DEPENDENCIES = $(LIBVISIR)
visir_spc_phot_la_SOURCES = visir_recipe.h visir_spc_phot.c
-visir_spc_phot_la_LIBADD = $(LIBVISIR)
+visir_spc_phot_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_spc_phot_la_LDFLAGS = -module -avoid-version
visir_spc_phot_la_DEPENDENCIES = $(LIBVISIR)
visir_spc_phot_ech_la_SOURCES = visir_recipe.h visir_spc_phot_ech.c
-visir_spc_phot_ech_la_LIBADD = $(LIBVISIR)
+visir_spc_phot_ech_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_spc_phot_ech_la_LDFLAGS = -module -avoid-version
visir_spc_phot_ech_la_DEPENDENCIES = $(LIBVISIR)
visir_old_img_phot_la_SOURCES = visir_recipe.h visir_img_phot.c
-visir_old_img_phot_la_LIBADD = $(LIBVISIR)
+visir_old_img_phot_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_old_img_phot_la_LDFLAGS = -module -avoid-version
visir_old_img_phot_la_DEPENDENCIES = $(LIBVISIR)
visir_old_spc_obs_la_SOURCES = visir_recipe.h visir_spc_obs.c
-visir_old_spc_obs_la_LIBADD = $(LIBVISIR)
+visir_old_spc_obs_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_spc_obs_la_LDFLAGS = -module -avoid-version
visir_old_spc_obs_la_DEPENDENCIES = $(LIBVISIR)
visir_old_spc_wcal_la_SOURCES = visir_recipe.h visir_spc_wcal.c
-visir_old_spc_wcal_la_LIBADD = $(LIBVISIR)
+visir_old_spc_wcal_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_spc_wcal_la_LDFLAGS = -module -avoid-version
visir_old_spc_wcal_la_DEPENDENCIES = $(LIBVISIR)
visir_old_spc_obs_ech_la_SOURCES = visir_recipe.h visir_spc_obs_ech.c
-visir_old_spc_obs_ech_la_LIBADD = $(LIBVISIR)
+visir_old_spc_obs_ech_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_spc_obs_ech_la_LDFLAGS = -module -avoid-version
visir_old_spc_obs_ech_la_DEPENDENCIES = $(LIBVISIR)
visir_old_spc_wcal_ech_la_SOURCES = visir_recipe.h visir_spc_wcal_ech.c
-visir_old_spc_wcal_ech_la_LIBADD = $(LIBVISIR)
+visir_old_spc_wcal_ech_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_spc_wcal_ech_la_LDFLAGS = -module -avoid-version
visir_old_spc_wcal_ech_la_DEPENDENCIES = $(LIBVISIR)
visir_old_spc_phot_la_SOURCES = visir_recipe.h visir_spc_phot.c
-visir_old_spc_phot_la_LIBADD = $(LIBVISIR)
+visir_old_spc_phot_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_spc_phot_la_LDFLAGS = -module -avoid-version
visir_old_spc_phot_la_DEPENDENCIES = $(LIBVISIR)
visir_old_spc_phot_ech_la_SOURCES = visir_recipe.h visir_spc_phot_ech.c
-visir_old_spc_phot_ech_la_LIBADD = $(LIBVISIR)
+visir_old_spc_phot_ech_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_old_spc_phot_ech_la_LDFLAGS = -module -avoid-version
visir_old_spc_phot_ech_la_DEPENDENCIES = $(LIBVISIR)
visir_util_img_std_cat_la_SOURCES = visir_recipe.h visir_util_img_std_cat.c
-visir_util_img_std_cat_la_LIBADD = $(LIBVISIR)
......@@ -106,24 +100,12 @@ Description: Add the cpl libraries to the recips.so and the test program
visir_util_spc_txt2fits_la_LDFLAGS = -module -avoid-version
visir_util_spc_txt2fits_la_DEPENDENCIES = $(LIBVISIR)
visir_util_inputs_la_SOURCES = visir_recipe.h visir_util_inputs.c
-visir_util_inputs_la_LIBADD = $(LIBVISIR)
+visir_util_inputs_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_util_inputs_la_LDFLAGS = -module -avoid-version
visir_util_inputs_la_DEPENDENCIES = $(LIBVISIR)
visir_util_repack_la_SOURCES = visir_recipe.h visir_util_repack.c
-visir_util_repack_la_LIBADD = $(LIBVISIR)
+visir_util_repack_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_util_repack_la_LDFLAGS = -module -avoid-version
visir_util_repack_la_DEPENDENCIES = $(LIBVISIR)
visir_util_weight2error_la_SOURCES = visir_recipe.h visir_util_weight2error.c
-visir_util_weight2error_la_LIBADD = $(LIBVISIR)
+visir_util_weight2error_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_util_weight2error_la_LDFLAGS = -module -avoid-version
visir_util_weight2error_la_DEPENDENCIES = $(LIBVISIR)
visir_util_convert_weight_la_SOURCES = visir_recipe.h visir_util_convert_weight.c
-visir_util_convert_weight_la_LIBADD = $(LIBVISIR)
+visir_util_convert_weight_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
......@@ -136,18 +118,6 @@ Description: Add the cpl libraries to the recips.so and the test program
visir_util_clip_la_LDFLAGS = -module -avoid-version
visir_util_clip_la_DEPENDENCIES = $(LIBVISIR)
visir_util_find_beam_la_SOURCES = visir_recipe.h visir_util_find_beam.c
-visir_util_find_beam_la_LIBADD = $(LIBVISIR)
+visir_util_find_beam_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_util_find_beam_la_LDFLAGS = -module -avoid-version
visir_util_find_beam_la_DEPENDENCIES = $(LIBVISIR)
visir_util_convert_pos_la_SOURCES = visir_recipe.h visir_util_convert_pos.c
-visir_util_convert_pos_la_LIBADD = $(LIBVISIR)
+visir_util_convert_pos_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_util_convert_pos_la_LDFLAGS = -module -avoid-version
visir_util_convert_pos_la_DEPENDENCIES = $(LIBVISIR)
visir_util_join_la_SOURCES = visir_recipe.h visir_util_join.c
-visir_util_join_la_LIBADD = $(LIBVISIR)
+visir_util_join_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
......@@ -159,3 +129,51 @@ Description: Add the cpl libraries to the recips.so and the test program
+visir_util_undistort_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
visir_util_undistort_la_LDFLAGS = -module -avoid-version
visir_util_undistort_la_DEPENDENCIES = $(LIBVISIR)
visir_old_util_destripe_la_SOURCES = visir_recipe.h visir_util_destripe.c
-visir_old_util_destripe_la_LIBADD = $(LIBVISIR)
+visir_old_util_destripe_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_old_util_destripe_la_LDFLAGS = -module -avoid-version
visir_old_util_destripe_la_DEPENDENCIES = $(LIBVISIR)
visir_util_detect_shift_la_SOURCES = visir_recipe.h visir_util_detect_shift.c
-visir_util_detect_shift_la_LIBADD = $(LIBVISIR)
+visir_util_detect_shift_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_util_detect_shift_la_LDFLAGS = -module -avoid-version
visir_util_detect_shift_la_DEPENDENCIES = $(LIBVISIR)
visir_util_qc_la_SOURCES = visir_recipe.h visir_util_qc.c
-visir_util_qc_la_LIBADD = $(LIBVISIR)
+visir_util_qc_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_util_qc_la_LDFLAGS = -module -avoid-version
visir_util_qc_la_DEPENDENCIES = $(LIBVISIR)
visir_util_apply_calib_la_SOURCES = visir_recipe.h visir_util_apply_calib.c
-visir_util_apply_calib_la_LIBADD = $(LIBVISIR)
+visir_util_apply_calib_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_util_apply_calib_la_LDFLAGS = -module -avoid-version
visir_util_apply_calib_la_DEPENDENCIES = $(LIBVISIR)
visir_util_run_swarp_la_SOURCES = visir_recipe.h visir_util_run_swarp.c
-visir_util_run_swarp_la_LIBADD = $(LIBVISIR)
+visir_util_run_swarp_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_util_run_swarp_la_LDFLAGS = -module -avoid-version
visir_util_run_swarp_la_DEPENDENCIES = $(LIBVISIR)
@@ -192,7 +192,7 @@
visir_util_join.c \
visir_img_phot.c
visir_img_reduce_la_CPPFLAGS = -DVISIR_CHAIN $(AM_CPPFLAGS)
-visir_img_reduce_la_LIBADD = $(LIBVISIR)
+visir_img_reduce_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_img_reduce_la_LDFLAGS = -module -avoid-version
visir_img_reduce_la_DEPENDENCIES = $(LIBVISIR)
@@ -202,6 +202,6 @@
visir_util_destripe.c \
visir_spc_obs.c
visir_spc_reduce_la_CPPFLAGS = -DVISIR_CHAIN $(AM_CPPFLAGS)
-visir_spc_reduce_la_LIBADD = $(LIBVISIR)
+visir_spc_reduce_la_LIBADD = $(LIBVISIR) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLDRS) $(LIBCPLUI)
visir_spc_reduce_la_LDFLAGS = -module -avoid-version
visir_spc_reduce_la_DEPENDENCIES = $(LIBVISIR)
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