Mercurial > mxe-octave

annotate src/libgeotiff-1-noundefined.patch @ 4037:85abb6c3ec8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-netcdf: patch for --enable-64 (Bug #46060) * src/of-netcdf-1-fixes.patch: new file * dist-files.mk: add of-netcdf-1-fixes.patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 29 Sep 2015 19:43:19 -0400
parents 6a4b0052211f
children 03a2432afc32
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3627
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -ur libgeotiff-1.4.0.orig/libxtiff/Makefile.am libgeotiff-1.4.0/libxtiff/Makefile.am
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- libgeotiff-1.4.0.orig/libxtiff/Makefile.am 2014-06-28 09:56:02.000000000 -0400
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 +++ libgeotiff-1.4.0/libxtiff/Makefile.am 2014-06-28 11:57:04.000000000 -0400
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -7,5 +7,5 @@
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 AM_CFLAGS = -I../ $(TIFF_CFLAGS)
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 libxtiff_la_SOURCES = xtiff.c
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 -
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 +libxtiff_la_LIBADD = -ltiff
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 noinst_LTLIBRARIES = libxtiff.la
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 diff -ur libgeotiff-1.4.0.orig/Makefile.am libgeotiff-1.4.0/Makefile.am
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 --- libgeotiff-1.4.0.orig/Makefile.am 2014-06-28 09:56:02.000000000 -0400
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 +++ libgeotiff-1.4.0/Makefile.am 2014-06-28 09:56:53.000000000 -0400
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 @@ -108,7 +108,7 @@
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 csv/unit_of_measure.c
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 endif
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 -libgeotiff_la_LDFLAGS = -version-info 3:0:1
4033
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
19 +libgeotiff_la_LDFLAGS = -version-info 3:0:1 -no-undefined
3627
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 libgeotiff_la_LIBADD = libxtiff/libxtiff.la
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 diff -ur libgeotiff-1.4.0.orig/Makefile.in libgeotiff-1.4.0/Makefile.in
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 --- libgeotiff-1.4.0.orig/Makefile.in 2014-06-28 09:56:02.000000000 -0400
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 +++ libgeotiff-1.4.0/Makefile.in 2014-06-28 17:37:48.000000000 -0400
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 @@ -448,7 +448,7 @@
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 geo_get.c geo_names.c geo_new.c geo_normalize.c geo_print.c \
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 geo_set.c geo_simpletags.c geo_tiffp.c geo_trans.c geo_write.c \
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 geo_strtod.c geotiff_proj4.c $(am__append_1)
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 -libgeotiff_la_LDFLAGS = -version-info 3:0:1
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 +libgeotiff_la_LDFLAGS = -version-info 3:0:1 -no-undefined
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 libgeotiff_la_LIBADD = libxtiff/libxtiff.la
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 lib_LTLIBRARIES = libgeotiff.la
9e2ff7672dc2 libgeotiff: fix shared lib build
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 EXTRA_DIST = makefile.vc \
4033
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
35 diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
36 --- libgeotiff-1.4.0.orig/configure.ac 2015-06-21 03:50:03.341076086 +0200
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
37 +++ libgeotiff-1.4.0/configure.ac 2015-06-21 03:50:39.741125191 +0200
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
38 @@ -280,7 +280,7 @@
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
39 PROJ_INC=-I$PROJ_INC
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
40
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
41 AC_SUBST(PROJ_INC,$PROJ_INC)
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
42 - AC_DEFINE(HAVE_PROJECTS_H)
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
43 + AC_DEFINE([HAVE_PROJECTS_H], [], [Description])
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
44 AC_DEFINE(HAVE_LIBPROJ)
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
45 AC_SUBST([HAVE_LIBPROJ])
6a4b0052211f libgeotiff: call autoreconf on build files, fix typo in patch
John Donoghue
parents: 3627
diff changeset
46 PROJ_CONFIG="yes"