[tlbuild] asymptote-2.56 in tl sources

[Ken Brown]

Thanks, John.  Yes, that fixes it, provided I also do the following:

--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,7 @@ GCLIB = @GCLIB@
  GCPPLIB = @GCPPLIB@
  GCLIBS = $(GCPPLIB) $(GCLIB)
  LFLAGS = @LDFLAGS@
-LIBS = $(LFLAGS) @PTHREAD_LIBS@ @LIBS@ @GLEW@ $(GCLIBS)
+LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS)
  DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lgdi32 -lwinmm -s -static

  PERL = perl

Without this I get 'undefined reference' errors in glew.o when linking.

Thanks again.

Ken

On 10/9/2019 6:17 PM, John Bowman wrote:
> I think all that I need to do is distinguish again between cygwin and msdos builds.
> The cygwin build is treated just like a normal UNIX build (case *).
> Does this patch work for you?
> 
> commit d59145980eb39a9d06faebdc7a0b40991a1903c9 (HEAD -> master, origin/master, 
> origin/HEAD)
> Author: John Bowman <bowman at ualberta.ca <mailto:bowman at ualberta.ca>>
> Date:   Wed Oct 9 16:13:48 2019 -0600
> 
>      Distinguish between msdos and cygwin builds.
> 
> diff --git a/build-scripts/build-asymptote.dos b/build-scripts/build-asymptote.dos
> index 943c7ca0..b8755c75 100755
> --- a/build-scripts/build-asymptote.dos
> +++ b/build-scripts/build-asymptote.dos
> @@ -31,7 +31,7 @@ fi
>   BUILD=build-$VERSION
>   ln -sf ../gc-$GC.tar.gz .
>   ln -sf ../gc-$GC .
> -make -n MSDOS=1 >& /dev/null || ./configure --enable-gc=$GC 
> --with-latex=/usr/local/share --with-context=/usr/local/share
> +make -n MSDOS=1 >& /dev/null || ./configure OSTYPE=msdos --enable-gc=$GC 
> --with-latex=/usr/local/share --with-context=/usr/local/share
>   rm -rf $BUILD
>   mkdir -p $BUILD
>   cp -a $HOME/dll/cygwin/*.dll $BUILD
> diff --git a/configure.ac <http://configure.ac> b/configure.ac <http://configure.ac>
> index 02092c84..32ce9d81 100644
> --- a/configure.ac <http://configure.ac>
> +++ b/configure.ac <http://configure.ac>
> @@ -229,7 +229,7 @@ AC_ARG_ENABLE(gc-full-debug,
> 
>   INCL=$INCL" -I/usr/include/tirpc"
> 
> -if test "$OSTYPE" = "cygwin"; then
> +if test "$OSTYPE" = "msdos"; then
>   CPPFLAGS=$CPPFLAGS" -D__MSDOS__ -I/usr/include/w32api -I/usr/include 
> -DCALLBACK=__stdcall $INCL"
>   else
>   CPPFLAGS=$CPPFLAGS" $INCL"
> @@ -384,7 +384,7 @@ if test "x$enable_openimageio" = "xyes"; then
>   fi
> 
>   case "$OSTYPE" in
> -     cygwin)
> +     msdos)
>                 AC_CHECK_LIB([gccpp],[GC_throw_bad_alloc])
>                 AC_CHECK_HEADER(GL/glut.h,
>                                     [AC_DEFINE(HAVE_LIBGLUT,1,
> 
> 
> On Wed, Oct 9, 2019 at 2:53 PM John Bowman <bowman at ualberta.ca 
> <mailto:bowman at ualberta.ca>> wrote:
> 
>     Hi Ken,
>     Actually, we have always used the win32api, not the X11 headers. All I did
>     was simplify the build process
>     to make it easier for others, avoiding the need to move /usr/include/GL out
>     of the way.
>     I'll look at your patch to see if there is a way to compile against X11; I
>     don't have X11 installed in cygwin so it may take some work.
> 
>     Re: your glew additions: TeXLive has specifically requested that glew be
>     explicitly compiled in, using the included glew.c source
>     instead of the GLEW library.
> 
>     -- John
> 
>     On Wed, Oct 9, 2019 at 1:46 PM Ken Brown <kbrow1i at gmail.com
>     <mailto:kbrow1i at gmail.com>> wrote:
> 
>         On 10/6/2019 4:04 PM, Karl Berry wrote:
>          > John (Bowman) has made more efforts to ease the asymptote build. The
>          > current release (2.56) is in the TeX Live source tree now. If you have a
>          > chance, please try it. (But don't commit new binaries anywhere -- we
>          > won't update the released TL until next year.) --thanks, karl.
> 
>         John,
> 
>         Commit 05f68ab80e7caa521c967b32ba672fa58bcaae3c in the asymptote git repo
>         changed the Cygwin build to use the Win32 API instead of the POSIX API.  I
>         assume this was done for builds that use Cygwin as a tool for building an
>         MS-Windows asymptote, but it breaks the ordinary Cygwin build (both for the
>         Cygwin distribution and for native TeX Live).
> 
>         Can you make the two builds co-exist again?  I was able to do the ordinary
>         Cygwin build by using the attached patch, but it probably breaks the
>         other use case.
> 
>         Ken
>