Changeset 764b1889

Timestamp:

11/16/2015 09:57:04 PM (8 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

a0751bdc

Parents:

6e16f2ef

Message:

asymptote: remove the workaround for current libgsl, replace it by a conditional sed to implement the upstream fix.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16664 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/typesetting/asymptote.xml (modified) (6 diffs)

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
-
     <listitem>
       <para>November 16th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix a build failure in asymptote-2.35 with
+          current libgsl. Fixes
+          <ulink url="&blfs-ticket-root;7104">#7104</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Add a modification from upstream to xmlto to fix a

pst/typesetting/asymptote.xml

@@ -72 +72 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Asymptote Dependencies</bridgehead>
-
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -89 +87 @@
     <para role="optional">
       <ulink url="http://www.fftw.org/">FFTW</ulink>,
-      <!-- link to an external version until asymptote is altered
-      to build with libgsl-2
-      <xref linkend="gsl"/> -->
-      <ulink url="http://ftp.gnu.org/pub/gnu/gsl/">libgsl</ulink> (versions &lt; 2.0)
+      <xref linkend="gsl"/>
     </para>
 
@@ -116 +111 @@
 
     <para>
+      If you have installed version 2 of libgsl, fix a build failure:
+    </para>
+
+<screen><userinput>sed -i -e '/ellint_D/s/3/2/' \
+sed    -e '/ellint_D/s/.SYM(n)//' gsl.cc</userinput></screen>
+
+    <para>
       Install <application>asymptote</application> by running the following
       commands:
@@ -129 +131 @@
  --enable-gc=system \
  --with-latex=/opt/texlive/&texlive-year;/texmf-dist/tex/latex \
- --with-context=/opt/texlive/&texlive-year;/texmf-dist/tex/context/third \
- --disable-gsl &amp;&amp;
+ --with-context=/opt/texlive/&texlive-year;/texmf-dist/tex/context/third &amp;&amp;
 make</userinput></screen>
 
@@ -161 +162 @@
     </para>
 
+    <para><parameter>sed ...</parameter>: change the reference to
+    <literal>gsl_sf_ellint_D</literal> to use addGSLDOUBLE2Func and to therefore
+    omit the last parameter, for gsl major version 2.</para>
+
     <para><parameter>--libdir=/opt/texlive/&texlive-year;/texmf-dist;</parameter>:
     This parameter ensures that the <filename class="directory">asymptote</filename>
@@ -173 +178 @@
     <application>texlive</application> directories instead of creating a
     <filename class="directory">texmf-local</filename> directory for them.</para>
-
-    <para><parameter>--disable-gsl</parameter>: if a current version of libgsl has
-    been installed, the configure script will attempt to use it and the build will
-    fail because of changes in that library. Remove this switch if you have installed
-    an older version of libgsl instead of the current version. It is believed that
-    few people need to link asymptote to libgsl: if you are one of those people,
-    please consider updating the user notes to explain what libgsl brings to
-    asymptote.</para>
 
   </sect2>