Andreas Tille pushed to branch master at Debian Med / mrbayes
Commits: a8263c35 by Andreas Tille at 2020-04-17T10:57:11+02:00 Fix autoconf issue - - - - - 1061f2ab by Andreas Tille at 2020-04-17T11:11:52+02:00 s/ADTTMP/AUTOPKGTEST_TMP/ - - - - - 480cc62d by Andreas Tille at 2020-04-17T11:12:06+02:00 Rpath patch remains needed - - - - - 5 changed files: - debian/changelog - + debian/patches/autoreconf.patch - + debian/patches/no_rpath.patch - + debian/patches/series - debian/tests/run-unit-test Changes: ===================================== debian/changelog ===================================== @@ -15,7 +15,8 @@ mrbayes (3.2.7a-1) UNRELEASED; urgency=medium * Standards-Version: 4.5.0 (routine-update) * debhelper-compat 12 (routine-update) * Drop version restrictions from libhmsbeagle-dev - * Remove patch applied upstream + * Fix autoconf issue + * Autopkgtest: s/ADTTMP/AUTOPKGTEST_TMP/ -- Andreas Tille <[email protected]> Sat, 11 Apr 2020 11:19:27 +0200 ===================================== debian/patches/autoreconf.patch ===================================== @@ -0,0 +1,15 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Sat, 11 Apr 2020 11:19:27 +0200 +Description: Fix autoconf issue + +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,8 @@ AC_CANONICAL_HOST + AC_DEFINE_UNQUOTED([HOST_TYPE], ["$host"], [Host triplet]) + AC_DEFINE_UNQUOTED([HOST_CPU], ["$host_cpu"], [Host CPU type]) + ++m4_pattern_allow([PKG_CHECK_MODULES]) ++ + # NB: DEFAULT CFLAGS: + # Using --enable-debug sets CFLAGS to "-g" ($debug_cflags) + # Not using --enable-debug sets CFLAGS to "-O3 -DNDEBUG" ($release_cflags) ===================================== debian/patches/no_rpath.patch ===================================== @@ -0,0 +1,24 @@ +Description: Do not include rpath +Author: Andreas Tille <[email protected]> +Last-Update: Wed, 27 Jun 2018 08:45:36 +0200 + +--- a/configure.ac ++++ b/configure.ac +@@ -150,7 +150,7 @@ AS_IF([test "x$with_beagle" != "xno"], [ + AC_MSG_NOTICE([Trying to locate Beagle ($beagle_pkg_name) in '$beagle_prefix']) + + CPPFLAGS="-I$beagle_prefix/$beagle_subinc" +- LDFLAGS="-L$beagle_prefix/$beagle_sublib -Wl,-rpath,$beagle_prefix/$beagle_sublib" ++ LDFLAGS="-L$beagle_prefix/$beagle_sublib" + LDLIBS="-lhmsbeagle" + + AC_CHECK_HEADER([libhmsbeagle/beagle.h], +@@ -179,7 +179,7 @@ AS_IF([test "x$with_beagle" != "xno"], [ + [AC_MSG_NOTICE([Found Beagle with pkg-config]) + beagle_found="yes" + # Augument the BEAGLE_LIBS value with -Wl,-rpath,... +- BEAGLE_LIBS="$BEAGLE_LIBS -Wl,-rpath,$(pkg-config --libs-only-L $beagle_pkg_name | sed 's/-L//')"], ++ BEAGLE_LIBS="$BEAGLE_LIBS"], + [beagle_found="no"]) + ]) dnl AS_IF + ===================================== debian/patches/series ===================================== @@ -0,0 +1,2 @@ +no_rpath.patch +autoreconf.patch ===================================== debian/tests/run-unit-test ===================================== @@ -2,12 +2,12 @@ pkg=mrbayes -if [ "$ADTTMP" = "" ] ; then - ADTTMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX) - trap "rm -rf $ADTTMP" 0 INT QUIT ABRT PIPE TERM +if [ "$AUTOPKGTEST_TMP" = "" ] ; then + AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX) + trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM fi -cd $ADTTMP +cd $AUTOPKGTEST_TMP cp -a /usr/share/doc/${pkg}/examples/* . gunzip -r * View it on GitLab: https://salsa.debian.org/med-team/mrbayes/-/compare/d29ef3c2d7ee0e1b3a7d753397d0d326954aed6b...480cc62d88c37a65e4e7a62f77fc793748672c25 -- View it on GitLab: https://salsa.debian.org/med-team/mrbayes/-/compare/d29ef3c2d7ee0e1b3a7d753397d0d326954aed6b...480cc62d88c37a65e4e7a62f77fc793748672c25 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
