diff options
| author | Ismael Luceno | 2019-08-13 22:24:57 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2019-08-13 22:26:00 +0200 |
| commit | 208504cde206973d4e12c7f3f94ecf2643d268de (patch) | |
| tree | 1e9f12cb3ac4294b95cc8bb568090481501199a8 /latex | |
| parent | 62604b25432e056d55a80ce2f58beaed76bf5a82 (diff) | |
texlive: Force correct linking with libgs
Diffstat (limited to 'latex')
| -rwxr-xr-x | latex/texlive/BUILD | 1 | ||||
| -rw-r--r-- | latex/texlive/HISTORY | 3 | ||||
| -rwxr-xr-x | latex/texlive/PRE_BUILD | 3 | ||||
| -rw-r--r-- | latex/texlive/patches/dvisvgm.patch | 24 |
4 files changed, 7 insertions, 24 deletions
diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD index 4542262545..a3d8047d8d 100755 --- a/latex/texlive/BUILD +++ b/latex/texlive/BUILD @@ -21,6 +21,7 @@ cd "$COMPILE_DIRECTORY" && --disable-multiplatform \ --without-x \ --disable-native-texlive-build \ + --disable-bundled-libs \ --disable-static --enable-shared \ --with-banner-add="/Source Mage GNU/Linux" \ $OPTS && diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY index ae3a19a475..e4b7a3fa18 100644 --- a/latex/texlive/HISTORY +++ b/latex/texlive/HISTORY @@ -1,3 +1,6 @@ +2019-08-13 Ismael Luceno <ismael@sourcemage.org> + * BUILD, PRE_BUILD: Force correct linking with libgs + 2019-05-01 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 20190410 * PRE_BUILD: extended poppler related code diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD index 3a2e204002..9bc0d8298a 100755 --- a/latex/texlive/PRE_BUILD +++ b/latex/texlive/PRE_BUILD @@ -3,6 +3,9 @@ cd "$SOURCE_DIRECTORY" && apply_patch_dir patches && +# Fix linking of dvisvgm; configure is broken +sedit 's/@LIBGS_LIBS@/-lgs/' texk/dvisvgm/dvisvgm-src/src/Makefile.in && + # removing as much internal things as possible #asymptote \ #devnag \ diff --git a/latex/texlive/patches/dvisvgm.patch b/latex/texlive/patches/dvisvgm.patch deleted file mode 100644 index cdd05ae239..0000000000 --- a/latex/texlive/patches/dvisvgm.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/texk/dvisvgm/dvisvgm-src/src//Makefile.am b/texk/dvisvgm/dvisvgm-src/src/Makefile.am ---- a/texk/dvisvgm/dvisvgm-src/src/Makefile.am -+++ b/texk/dvisvgm/dvisvgm-src/src/Makefile.am -@@ -28,7 +28,7 @@ dvisvgm_LDADD += \ - $(FREETYPE2_LIBS) \ - $(FONTFORGE_LIBS) \ - $(ZLIB_LIBS) \ -- $(LIBGS_LIBS) -+ $(LIBGS_LIBS) -ldl - - dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) - dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) -diff --git a/texk/dvisvgm/dvisvgm-src/src//Makefile.in b/texk/dvisvgm/dvisvgm-src/src/Makefile.in ---- a/texk/dvisvgm/dvisvgm-src/src/Makefile.in -+++ b/texk/dvisvgm/dvisvgm-src/src/Makefile.in -@@ -556,7 +556,7 @@ - dvisvgm_LDADD = $(noinst_LIBRARIES) ../libs/clipper/libclipper.a \ - $(POTRACE_LIBS) $(XXHASH_LIBS) $(am__append_5) $(am__append_6) \ - $(am__append_7) $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) \ -- $(FONTFORGE_LIBS) $(ZLIB_LIBS) $(LIBGS_LIBS) -+ $(FONTFORGE_LIBS) $(ZLIB_LIBS) $(LIBGS_LIBS) -ldl - dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) $(KPATHSEA_DEPEND) \ - $(ZLIB_DEPEND) $(FREETYPE2_DEPEND) - libdvisvgm_a_SOURCES = AGLTable.hpp BasicDVIReader.cpp \ |