Skip to content
Snippets Groups Projects
Commit bf929520 authored by Luigi Scarso's avatar Luigi Scarso
Browse files

sinc with TeXLive revision 41114. (0.95.0)

parent 45de9582
Branches
Tags
No related merge requests found
......@@ -124,18 +124,27 @@ Asymptote has been built with the following flags:
export CC=/opt/csw/bin/gcc-5.2
export CXX=/opt/csw/bin/g++-5.2
./configure --prefix=/tmp/asyinst --enable-texlive-build \
--disable-fftw --disable-offscreen \
--disable-fftw --disable-offscreen --disable-sigsegv \
--disable-gl --disable-gsl --disable-readline
Even though GL, GSL and readline should generally not be disabled,
the resulting binaries would not be portable enough otherwise.
Because a newer gcc compiler was used we had to link statically against stdlib.
In the last command that builds the asy binary the following part:
-lnsl -lrt -lz -lm gc-7.4.2/.libs/libgc.a
was replaced by:
gc-7.4.2/.libs/libgc.a -nodefaultlibs -Wl,-Bstatic -lstdc++ \
-Wl,-Bdynamic -lnsl -lrt -lz -lm -lgcc_eh -lgcc -lc
The following patch/hack took care of this:
--- Makefile.in.orig
+++ Makefile.in
@@ -11,7 +11,7 @@
GCPPLIB = @GCPPLIB@
GCLIBS = $(GCPPLIB) $(GCLIB)
LFLAGS = @LDFLAGS@
-LIBS = $(LFLAGS) @PTHREAD_LIBS@ @LIBS@ $(GCLIBS)
+LIBS = $(LFLAGS) $(GCLIBS) -nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic @PTHREAD_LIBS@ @LIBS@ -lgcc_eh -lgcc -lc
DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -s -static
PERL = perl
------
The resulting binary depends on:
......@@ -165,17 +174,6 @@ Additional notes:
and put into gc-7.4.2
Running ./autogen.sh was needed before proceeding
* Workarounds were needed for:
* https://github.com/vectorgraphics/asymptote/issues/19
CC and CXX env variables are not respected when building GC
* https://github.com/vectorgraphics/asymptote/issues/20
Provide a configure-time option to disable sigsegv
* https://github.com/vectorgraphics/asymptote/pull/21
Makefile.in: replace 'test ! -e' => 'test ! -s'
* https://github.com/vectorgraphics/asymptote/issues/22
Wrong expansion of revision in Bourne Shell
* Patches used are listed below.
Building texlive
================
......@@ -198,58 +196,3 @@ For that reason binaries were compiled twice, once without those flags
and --disable-upmendex and the second time with those two flags,
but taking just 'upmendex'.
Patches for Asymptote
=====================
--- Makefile.in (revision 40918)
+++ Makefile.in (working copy)
@@ -114,7 +114,7 @@
fi
version: $(GCLIB) $(FILES:=.o)
- if test ! -e revision.cc -o "$(revision)" != "$(last)"; then \
+ if test ! -s revision.cc -o "$(revision)" != "$(last)"; then \
echo $(REVISION)\"$(revision)\"\; > revision.cc; \
fi
$(CXX) $(OPTS) $(INCL) -o revision.o -c revision.cc;
@@ -160,7 +160,7 @@
mv gc-7.2 gc-7.2d; \
fi
cd $(GC) && \
- ./configure $(GCOPTIONS); \
+ ./configure CC="$(CC)" CXX="$(CXX)" $(GCOPTIONS); \
$(MAKE) check
$(GCPPLIB): $(GCLIB)
--- configure.ac (revision 40918)
+++ configure.ac (working copy)
@@ -223,15 +223,15 @@
AC_SUBST(OPTIONS)
# Checks for libraries.
-AC_CHECK_LIB([ncurses], [setupterm], [AC_DEFINE(HAVE_LIBCURSES)
- LIBS=$LIBS"-lncurses "],
- AC_CHECK_LIB([curses], [setupterm]))
+#AC_CHECK_LIB([ncurses], [setupterm], [AC_DEFINE(HAVE_LIBCURSES)
+# LIBS=$LIBS"-lncurses "],
+# AC_CHECK_LIB([curses], [setupterm]))
AC_CHECK_LIB([m], [sqrt],,
AC_MSG_ERROR([*** Please install libm on your system ***]))
AC_CHECK_LIB([z], [deflate],,
AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***]))
AX_PTHREAD
-AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
+#AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
AC_CHECK_LIB([rt], [sched_yield])
AC_ARG_ENABLE(readline,
@@ -254,7 +254,7 @@
# Checks for header files.
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([fenv.h stddef.h libintl.h])
-AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h], [break])
+#AC_CHECK_HEADERS([ncurses/curses.h ncurses.h curses.h], [break])
AC_CHECK_HEADERS(fpu_control.h)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "xstream.h"])],
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment