[Git][debian-gis-team/gdal][master] Add patch to use pkg-config for libdap when dap-config is not available.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Sep 29 20:32:10 BST 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / gdal
Commits:
a38749b8 by Bas Couwenberg at 2021-09-29T20:29:16+02:00
Add patch to use pkg-config for libdap when dap-config is not available.
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/libdap.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -5,6 +5,7 @@ gdal (3.3.2+dfsg-2) UNRELEASED; urgency=medium
- Drop --list-missing from dh_install
* Remove executable bit from examples.
* Drop --autodest from dh_install.
+ * Add patch to use pkg-config for libdap when dap-config is not available.
-- Bas Couwenberg <sebastic at debian.org> Wed, 08 Sep 2021 16:23:23 +0200
=====================================
debian/patches/libdap.patch
=====================================
@@ -0,0 +1,90 @@
+Description: Use pkg-config for libdap when dap-config is not available.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/gdal/pull/4567
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4202,39 +4202,47 @@ else
+ dnl libs from dap-config gets added further down
+ AC_MSG_RESULT([libdap $LIBDAP_VER])
+ else
+- dnl Check the version by compiling test programs
++ PKG_PROG_PKG_CONFIG([0.21])
++ PKG_CHECK_MODULES(LIBDAP,[libdap], [HAVE_LIBDAP=yes], [HAVE_LIBDAP=no])
+
+- dnl Test if we have libdap >= 3.10
+- dnl From libdap 3.10, AISConnect.h has been renamed as Connect.h
+- rm -f islibdappost310.*
+- echo '#include "Connect.h"' > islibdappost310.cpp
+- echo 'int main(int argc, char** argv) { return 0; } ' >> islibdappost310.cpp
+- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappost310.cpp -c ${DODS_INC} ${CPPFLAGS} 2>&1`" ; then
+- dnl yes, libdap >= 3.10
+- DODS_INC="$DODS_INC -DLIBDAP_310 -DLIBDAP_39"
+- AC_MSG_RESULT([libdap >= 3.10])
++ if test "${HAVE_LIBDAP}" = "yes"; then
++ dnl The dods driver needs LIBDAP_320 and LIBDAP_39 defined to include the right headers
++ DODS_INC="$DODS_INC $LIBDAP_CFLAGS -DLIBDAP_310 -DLIBDAP_39"
+ else
+- AC_MSG_RESULT([libdap < 3.10])
++ dnl Check the version by compiling test programs
+
+- dnl Test if we have libdap < 3.9
+- dnl Before libdap < 3.9, DAS derived from AttrTable class
+- dnl I wish they had defines with version numbers instead of this test !
+- rm -f islibdappre39.*
+- echo '#include "DAS.h"' > islibdappre39.cpp
+- echo '#include "AttrTable.h"' >> islibdappre39.cpp
+- echo 'using namespace libdap;' >> islibdappre39.cpp
+- echo 'int main(int argc, char** argv) { DAS oDAS; AttrTable& oAttrTable = oDAS; } ' >> islibdappre39.cpp
+- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappre39.cpp -c ${DODS_INC} 2>&1`" ; then
+- dnl yes, libdap < 3.9
+- AC_MSG_RESULT([libdap < 3.9])
++ dnl Test if we have libdap >= 3.10
++ dnl From libdap 3.10, AISConnect.h has been renamed as Connect.h
++ rm -f islibdappost310.*
++ echo '#include "Connect.h"' > islibdappost310.cpp
++ echo 'int main(int argc, char** argv) { return 0; } ' >> islibdappost310.cpp
++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappost310.cpp -c ${DODS_INC} ${CPPFLAGS} 2>&1`" ; then
++ dnl yes, libdap >= 3.10
++ DODS_INC="$DODS_INC -DLIBDAP_310 -DLIBDAP_39"
++ AC_MSG_RESULT([libdap >= 3.10])
+ else
+- DODS_INC="$DODS_INC -DLIBDAP_39"
+- AC_MSG_RESULT([libdap >= 3.9])
+- fi
+- rm -f islibdappre39.*
++ AC_MSG_RESULT([libdap < 3.10])
++
++ dnl Test if we have libdap < 3.9
++ dnl Before libdap < 3.9, DAS derived from AttrTable class
++ dnl I wish they had defines with version numbers instead of this test !
++ rm -f islibdappre39.*
++ echo '#include "DAS.h"' > islibdappre39.cpp
++ echo '#include "AttrTable.h"' >> islibdappre39.cpp
++ echo 'using namespace libdap;' >> islibdappre39.cpp
++ echo 'int main(int argc, char** argv) { DAS oDAS; AttrTable& oAttrTable = oDAS; } ' >> islibdappre39.cpp
++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} islibdappre39.cpp -c ${DODS_INC} 2>&1`" ; then
++ dnl yes, libdap < 3.9
++ AC_MSG_RESULT([libdap < 3.9])
++ else
++ DODS_INC="$DODS_INC -DLIBDAP_39"
++ AC_MSG_RESULT([libdap >= 3.9])
++ fi
++ rm -f islibdappre39.*
+
++ fi
++ rm -f islibdappost310.*
+ fi
+- rm -f islibdappost310.*
+ fi
+
+
+@@ -4245,6 +4253,8 @@ else
+ elif test -x $DODS_BIN/dap-config ; then
+ dnl OPeNDAP 3.4 and earlier lack opendap-config, but use it if avail.
+ LIBS="$LIBS `$DODS_BIN/dap-config --libs`"
++ elif test "${HAVE_LIBDAP}" = "yes"; then
++ LIBS="$LIBS $LIBDAP_LIBS"
+ else
+ dnl Otherwise try to put things together in a more primitive way.
+ LIBS="$LIBS -L$DODS_LIB -ldap++ -lpthread -lrx"
=====================================
debian/patches/series
=====================================
@@ -7,3 +7,4 @@ java.opt
perl-vendor
perl-doxyfile
spelling-errors.patch
+libdap.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/commit/a38749b8d5f8eb5fcfbe37cbd58e31116c4c36d1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/commit/a38749b8d5f8eb5fcfbe37cbd58e31116c4c36d1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210929/f7dac267/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list