[tlbuild] PATCHES: --with-system-xpdf, various build system niggles...

[Edd Barrett]

Hi Guys,

A few bits:

I am having to patch the build system in order to get texlive linking a system
poppler (see attachd).

The first is a problem with /bin/sh and the quoting used on POPPLER_VERSION.
The socond are some missing fontconfig includes in the build system, which
only show themselves when using an external poppler.

Also I had to add LDFLAGS=-lm to have the poppler test (in ./configure) work,
otherwise a few math.h functions would remain unresolved. There is not a patch
for this, I add it manually to the port build.

I am not sure if these patches are suitable for mainstream usage, but I
thought I would bring them to your attention.

May I also suggest --with-gettext-includes= and --with-gettext-libdir=
configure options. On OpenBSD gettext (when installed) goes into /usr/local/.
As a quick hack I tried adding CPPFLAGS=-I/usr/local/include
LDFLAGS=-L/usr/local/lib, although this did build the parts needing gettext
properly, it caused the system ICU to be used for XeTeX, which obviously does
not work. For now I have had to patch in manually these paths only where
gettext is used.

Howver, on the whole, the build system is greatly improved compared to last
year! I have only 3 patches applied at the moment, whereas last year I had in
excess of 50. Great work!

Thanks

-- 

Best Regards

Edd Barrett
(Freelance software developer / technical writer / open-source developer)

http://students.dec.bmth.ac.uk/ebarrett
-------------- next part --------------
$OpenBSD$
--- configure.orig	Sat Jul  4 17:27:52 2009
+++ configure	Sat Jul  4 17:42:02 2009
@@ -20683,7 +20683,7 @@ else
 fi
 
 if $PKG_CONFIG poppler --atleast-version=0.10; then
-  POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+  POPPLER_VERSION='-DPOPPLER_VERSION="'`$PKG_CONFIG poppler --modversion`'"'
   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
 elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
-------------- next part --------------
$OpenBSD$
--- texk/web2c/Makefile.in.orig	Sun Jul  5 19:11:04 2009
+++ texk/web2c/Makefile.in	Sun Jul  5 19:16:53 2009
@@ -953,7 +953,7 @@ WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
 WEB2CVERSION = @WEB2CVERSION@
 XMKMF = @XMKMF@
 XPDF_DEPEND = @XPDF_DEPEND@
-XPDF_INCLUDES = @XPDF_INCLUDES@
+XPDF_INCLUDES = @XPDF_INCLUDES@ @XPDF_INCLUDES@/..
 XPDF_LIBS = @XPDF_LIBS@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -6850,7 +6850,7 @@ xetex-synctex-xe.obj: synctex-xe.c
 @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
 
 libluatex_a-pdftoepdf.o: luatexdir/image/pdftoepdf.cc
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libluatex_a-pdftoepdf.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdftoepdf.Tpo -c -o libluatex_a-pdftoepdf.o `test -f 'luatexdir/image/pdftoepdf.cc' || echo '$(srcdir)/'`luatexdir/image/pdftoepdf.cc
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(FONTCONFIG_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libluatex_a-pdftoepdf.o -MD -MP -MF $(DEPDIR)/libluatex_a-pdftoepdf.Tpo -c -o libluatex_a-pdftoepdf.o `test -f 'luatexdir/image/pdftoepdf.cc' || echo '$(srcdir)/'`luatexdir/image/pdftoepdf.cc
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libluatex_a-pdftoepdf.Tpo $(DEPDIR)/libluatex_a-pdftoepdf.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='luatexdir/image/pdftoepdf.cc' object='libluatex_a-pdftoepdf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -6864,7 +6864,7 @@ libluatex_a-pdftoepdf.obj: luatexdir/image/pdftoepdf.c
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libluatex_a-pdftoepdf.obj `if test -f 'luatexdir/image/pdftoepdf.cc'; then $(CYGPATH_W) 'luatexdir/image/pdftoepdf.cc'; else $(CYGPATH_W) '$(srcdir)/luatexdir/image/pdftoepdf.cc'; fi`
 
 libpdftex_a-pdftoepdf.o: pdftexdir/pdftoepdf.cc
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libpdftex_a-pdftoepdf.o -MD -MP -MF $(DEPDIR)/libpdftex_a-pdftoepdf.Tpo -c -o libpdftex_a-pdftoepdf.o `test -f 'pdftexdir/pdftoepdf.cc' || echo '$(srcdir)/'`pdftexdir/pdftoepdf.cc
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(FONTCONFIG_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libpdftex_a-pdftoepdf.o -MD -MP -MF $(DEPDIR)/libpdftex_a-pdftoepdf.Tpo -c -o libpdftex_a-pdftoepdf.o `test -f 'pdftexdir/pdftoepdf.cc' || echo '$(srcdir)/'`pdftexdir/pdftoepdf.cc
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libpdftex_a-pdftoepdf.Tpo $(DEPDIR)/libpdftex_a-pdftoepdf.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='pdftexdir/pdftoepdf.cc' object='libpdftex_a-pdftoepdf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -7088,7 +7088,7 @@ pdftex-dummy.obj: dummy.cxx
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o pdftex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
 
 pdftosrc-pdftosrc.o: pdftexdir/pdftosrc.cc
- at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pdftosrc-pdftosrc.o -MD -MP -MF $(DEPDIR)/pdftosrc-pdftosrc.Tpo -c -o pdftosrc-pdftosrc.o `test -f 'pdftexdir/pdftosrc.cc' || echo '$(srcdir)/'`pdftexdir/pdftosrc.cc
+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(FONTCONFIG_INCLUDES) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pdftosrc-pdftosrc.o -MD -MP -MF $(DEPDIR)/pdftosrc-pdftosrc.Tpo -c -o pdftosrc-pdftosrc.o `test -f 'pdftexdir/pdftosrc.cc' || echo '$(srcdir)/'`pdftexdir/pdftosrc.cc
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/pdftosrc-pdftosrc.Tpo $(DEPDIR)/pdftosrc-pdftosrc.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='pdftexdir/pdftosrc.cc' object='pdftosrc-pdftosrc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@