[25969] in Source-Commits
Re: /svn/athena r25322 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Jul 29 23:41:05 2011
Date: Fri, 29 Jul 2011 23:40:56 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Geoffrey Thomas <geofft@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201107291947.p6TJlaAs016284@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1107292340530.7526@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Fri, 29 Jul 2011, Geoffrey Thomas wrote:
> Author: geofft
> Date: 2011-07-29 15:47:36 -0400 (Fri, 29 Jul 2011)
> New Revision: 25322
>
> Modified:
> trunk/debathena/meta/thirdparty-libraries/debian/changelog
> trunk/debathena/meta/thirdparty-libraries/debian/control.in
> trunk/debathena/meta/thirdparty-libraries/debian/rules
> Log:
> In thirdparty-libraries:
> libmpfr1ldbl on Lucid). But require libmpfr1ldbl where it does exist.
>
>
> Modified: trunk/debathena/meta/thirdparty-libraries/debian/changelog
> ===================================================================
> --- trunk/debathena/meta/thirdparty-libraries/debian/changelog 2011-07-29 19:36:07 UTC (rev 25321)
> +++ trunk/debathena/meta/thirdparty-libraries/debian/changelog 2011-07-29 19:47:36 UTC (rev 25322)
> @@ -7,7 +7,7 @@
> [ Geoffrey Thomas ]
> * Use libmpfr-dev instead, so that we get libmpfr4 on Natty and on
> releases where libmpfr1ldbl doesn't exist (but continue to get
> - libmpfr1ldbl on Lucid)
> + libmpfr1ldbl on Lucid). But require libmpfr1ldbl where it does exist.
>
> -- Geoffrey Thomas <geofft@mit.edu> Thu, 28 Jul 2011 21:52:12 -0400
>
>
> Modified: trunk/debathena/meta/thirdparty-libraries/debian/control.in
> ===================================================================
> --- trunk/debathena/meta/thirdparty-libraries/debian/control.in 2011-07-29 19:36:07 UTC (rev 25321)
> +++ trunk/debathena/meta/thirdparty-libraries/debian/control.in 2011-07-29 19:47:36 UTC (rev 25322)
> @@ -93,7 +93,7 @@
> python-psycopg2,
> libppl-c2,
> libcurl4-gnutls-dev,
> - libmpfr-dev,
> + libmpfr-dev, ${debathena-maybe-libmpfr1ldbl},
> ${misc:Depends}
> Recommends: libatlas-base-dev,
> libatlas-sse-dev,
>
> Modified: trunk/debathena/meta/thirdparty-libraries/debian/rules
> ===================================================================
> --- trunk/debathena/meta/thirdparty-libraries/debian/rules 2011-07-29 19:36:07 UTC (rev 25321)
> +++ trunk/debathena/meta/thirdparty-libraries/debian/rules 2011-07-29 19:47:36 UTC (rev 25322)
> @@ -1,3 +1,10 @@
> #!/usr/bin/make -f
>
> +HAVE_MPFR1 = $(shell apt-cache show libmpfr1ldbl 2>/dev/null | grep -q '^Version:' && echo y)
> +
> +ifeq ($(HAVE_MPFR1),y)
> + binary-predeb/debathena-thirdparty-libraries::
> + echo "debathena-maybe-libmpfr1ldbl=libmpfr1ldbl" >> debian/debathena-thirdparty-libraries.substvars
> +endif
> +
> include /usr/share/cdbs/1/rules/debhelper.mk
>
>
