Attachment 218841 Details for Bug 234221 – Patch to fix mixing libc++/libstdc++ and -fcommon issues

[patch] Patch to fix mixing libc++/libstdc++ and -fcommon issues

print__tex-luatex-fix-common-1.diff (text/plain), 5.87 KB, created by Dimitry Andric on 2020-10-17 14:18:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2020-10-17 14:18:54 UTC

Size: 5.87 KB

patch

obsolete

>Index: print/tex-luatex/Makefile
>===================================================================
>--- print/tex-luatex/Makefile	(revision 552400)
>+++ print/tex-luatex/Makefile	(working copy)
>@@ -74,14 +74,12 @@ CONFIGURE_ARGS+=--with-system-$L \
> 		--with-$L-include=${LOCALBASE}/include \
> 		--with-$L-libdir=${LOCALBASE}/lib
> .endfor
>+CONFIGURE_ARGS+=CC="${CC}" \
>+		CXX="${CXX}"
> CPPFLAGS+=	-I${LOCALBASE}/include
> MAKE_JOBS_UNSAFE=	yes
> TEX_FORMATS=	luatex
> 
>-# Fix build on recent current -- our tex is so outdated,
>-# that it's unlikely that any upstream patches apply.
>-CFLAGS+=	-fcommon
>-
> # buildenv and dumpenv in Makefile uses hard-coded TEXMFCNF.
> post-extract:
> 	cd ${WRKSRC}/.. && \
>Index: print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
>===================================================================
>--- print/tex-luatex/files/patch-luatexdir_font_luatexfont.h	(nonexistent)
>+++ print/tex-luatex/files/patch-luatexdir_font_luatexfont.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- luatexdir/font/luatexfont.h.orig	2015-03-20 07:59:58 UTC
>++++ luatexdir/font/luatexfont.h
>+@@ -149,8 +149,6 @@ void replace_packet_fonts(internal_font_number f, int 
>+                           int *new_fontid, int count);
>+ int *packet_local_fonts(internal_font_number f, int *num);
>+ 
>+-int packet_cur_s;               /* current |do_vf_packet()| recursion level */
>+-int packet_stack_ptr;           /* pointer into |packet_stack| */
>+ vf_struct *new_vfstruct(void);
>+ 
>+ /* writecff.c */
>
>Property changes on: print/tex-luatex/files/patch-luatexdir_font_luatexfont.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/tex-luatex/files/patch-luatexdir_image_writeimg.h
>===================================================================
>--- print/tex-luatex/files/patch-luatexdir_image_writeimg.h	(nonexistent)
>+++ print/tex-luatex/files/patch-luatexdir_image_writeimg.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- luatexdir/image/writeimg.h.orig	2015-03-20 07:59:58 UTC
>++++ luatexdir/image/writeimg.h
>+@@ -27,7 +27,7 @@
>+ #  include "pdf/pdfpage.h"
>+ 
>+ typedef image_dict *idict_entry;
>+-idict_entry *idict_array;
>++extern idict_entry *idict_array;
>+ 
>+ void new_img_pdfstream_struct(image_dict *);
>+ image *new_image(void);
>
>Property changes on: print/tex-luatex/files/patch-luatexdir_image_writeimg.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/tex-luatex/files/patch-luatexdir_image_writeimg.w
>===================================================================
>--- print/tex-luatex/files/patch-luatexdir_image_writeimg.w	(nonexistent)
>+++ print/tex-luatex/files/patch-luatexdir_image_writeimg.w	(working copy)
>@@ -0,0 +1,11 @@
>+--- luatexdir/image/writeimg.w.orig	2015-03-20 07:59:58 UTC
>++++ luatexdir/image/writeimg.w
>+@@ -125,6 +125,8 @@
>+ #define HEADER_PDF "%PDF-1."
>+ #define MAX_HEADER (sizeof(HEADER_PNG)-1)
>+ 
>++idict_entry *idict_array;
>++
>+ static void check_type_by_header(image_dict * idict)
>+ {
>+     int i;
>
>Property changes on: print/tex-luatex/files/patch-luatexdir_image_writeimg.w
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h
>===================================================================
>--- print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h	(nonexistent)
>+++ print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- luatexdir/pdf/pdftables.h.orig	2015-03-20 07:59:58 UTC
>++++ luatexdir/pdf/pdftables.h
>+@@ -21,7 +21,7 @@
>+ #ifndef PDFTABLES_H
>+ #  define PDFTABLES_H
>+ 
>+-const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
>++extern const char *pdf_obj_typenames[PDF_OBJ_TYPE_MAX + 1];
>+ 
>+ typedef enum {
>+     union_type_int,
>
>Property changes on: print/tex-luatex/files/patch-luatexdir_pdf_pdftables.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/tex-luatex/files/patch-luatexdir_tex_textoken.w
>===================================================================
>--- print/tex-luatex/files/patch-luatexdir_tex_textoken.w	(nonexistent)
>+++ print/tex-luatex/files/patch-luatexdir_tex_textoken.w	(working copy)
>@@ -0,0 +1,11 @@
>+--- luatexdir/tex/textoken.w.orig	2015-03-28 00:34:27 UTC
>++++ luatexdir/tex/textoken.w
>+@@ -75,7 +75,7 @@ maximum memory usage. When code between the delimiters
>+ report these statistics when |tracing_stats| is sufficiently large.
>+ 
>+ @c
>+-int var_used, dyn_used;         /* how much memory is in use */
>++int dyn_used;                   /* how much memory is in use */
>+ 
>+ halfword avail;                 /* head of the list of available one-word nodes */
>+ unsigned fix_mem_end;           /* the last one-word node used in |mem| */
>
>Property changes on: print/tex-luatex/files/patch-luatexdir_tex_textoken.w
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 234221: 200309 | 200667 | 204593 | 218841 | 218857 | 218859