[tex-live] build on i386-linux

Olaf Weber olaf at infovore.xs4all.nl
Mon Aug 22 20:05:19 CEST 2005


Thomas Esser writes:

>> I suspect you have used rc2.
> Oops, thanks. #7805 fixes it.


Fixing a few regressions (from the 1.30.0 I checked into tex-live):


Change 7813 by olaf at olaf on 2005/08/22 19:54:16

	Regression: faulty use of xretalloc was re-introduced with the
	latest merge.

Affected files ...

... //depot/Build/source.development/TeX/texk/web2c/pdftexdir/epdf.c#10 edit

Differences ...

==== //depot/Build/source.development/TeX/texk/web2c/pdftexdir/epdf.c#10 (ktext) ====

@@ -17,7 +17,7 @@
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/epdf.c#9 $
+$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/epdf.c#10 $
 */
 
 #include "ptexlib.h"
@@ -46,9 +46,7 @@
     if (new_charset == NULL)
         new_charset = xstrdup(charset);
     else {
-        new_charset = xretalloc(new_charset, 
-                                strlen(new_charset) + strlen(charset) + 1,
-                                char);
+        xretalloc(new_charset, strlen(new_charset)+strlen(charset)+1, char);
         strcat(new_charset, charset);
     }
     fm->charset = new_charset;



Change 7814 by olaf at olaf on 2005/08/22 19:56:16

	Regression: ttf1afm should be ttf2afm.

Affected files ...

... //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk#38 edit

Differences ...

==== //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk#38 (ktext) ====

@@ -6,11 +6,11 @@
 # number or how they are configured requires changes to the main distribution
 # anyway.
 
-# $Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk#37 $
+# $Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/pdftex.mk#38 $
 
 Makefile: pdftexdir/pdftex.mk
 
-pdftex_bin = pdftex pdfetex ttf1afm pdftosrc
+pdftex_bin = pdftex pdfetex ttf2afm pdftosrc
 linux_build_dir = $(HOME)/pdftex/build/linux/texk/web2c
 
 # We build pdftex


Change 7815 by olaf at olaf on 2005/08/22 19:58:01

	Regression: faulty use of xretalloc was reintroduced.

Affected files ...

... //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ptexmac.h#18 edit

Differences ...

==== //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ptexmac.h#18 (ktext) ====

@@ -17,7 +17,7 @@
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ptexmac.h#17 $
+$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ptexmac.h#18 $
 */
 
 #ifndef PDFTEXMAC
@@ -105,7 +105,7 @@
 #define skip(p, c)   if (*p == c)  p++
 
 #define alloc_array(T, n, s) do {                           \
-    if (T##_array == NULL) {                                   \
+    if (T##_array == NULL) {                                \
         T##_limit = (s);                                    \
         if ((n) > T##_limit)                                \
             T##_limit = (n);                                \
@@ -117,7 +117,7 @@
         T##_limit *= 2;                                     \
         if (T##_ptr - T##_array + (n) > T##_limit)          \
             T##_limit = T##_ptr - T##_array + (n);          \
-        T##_array = xretalloc(T##_array, T##_limit, T##_entry); \
+        xretalloc(T##_array, T##_limit, T##_entry);         \
         T##_ptr = T##_array + last_ptr_index;               \
     }                                                       \
 } while (0)



Change 7816 by olaf at olaf on 2005/08/22 19:59:42

	Regression: wrong printf format specs were reintroduced.

Affected files ...

... //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ttf2afm.c#21 edit

Differences ...

==== //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ttf2afm.c#21 (ktext) ====

@@ -17,7 +17,7 @@
 along with pdfTeX; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ttf2afm.c#20 $
+$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ttf2afm.c#21 $
 */
 
 /*
@@ -38,7 +38,7 @@
 #include <pdftexdir/writettf.h>
 
 static const char perforce_id[] = 
-    "$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ttf2afm.c#20 $";
+    "$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/ttf2afm.c#21 $";
 
 /* constants used for print_glyph */
 #define AS_NAME         0
@@ -665,15 +665,15 @@
         else if (n == notdef && glyph_index == 0)
             fputs(notdef, f);
         else
-            fprintf(f, "%s%i", GLYPH_PREFIX_INDEX, glyph_index);
+            fprintf(f, "%s%li", GLYPH_PREFIX_INDEX, glyph_index);
         break;
     case AS_INDEX:
-        fprintf(f, "%s%i", GLYPH_PREFIX_INDEX, glyph_index);
+        fprintf(f, "%s%li", GLYPH_PREFIX_INDEX, glyph_index);
         break;
     case AS_UNICODE:
         u = mtx_tab[glyph_index].unicode_list;
         if (glyph_index == 0 || u == NULL)
-            fprintf(f, "%s%i", GLYPH_PREFIX_INDEX, glyph_index);
+            fprintf(f, "%s%li", GLYPH_PREFIX_INDEX, glyph_index);
         else {
             fprintf(f, "%s%.4X", GLYPH_PREFIX_UNICODE, u->code);
             if (u->next != NULL) {
@@ -682,7 +682,7 @@
                     assert(strlen(buf) + strlen(GLYPH_PREFIX_UNICODE) + 4 < sizeof(buf));
                     sprintf(strend(buf), "%s%.4X ", GLYPH_PREFIX_UNICODE, u->code);
                 }
-                ttf_warn("glyph %i have multiple encodings: %s", 
+                ttf_warn("glyph %li have multiple encodings: %s", 
                          glyph_index, buf);
             }
         }
@@ -872,7 +872,7 @@
             break;
         case 4:
             for (i = 0; i < nglyphs; ++i) {
-                fprintf(file, "%% Glyph %i -> ", i);
+                fprintf(file, "%% Glyph %li -> ", i);
                 print_glyph_name(file, i, AS_UNICODE);
                 fputs("\n", file);
             }
@@ -923,7 +923,7 @@
 
 int main(int argc, char **argv)
 {
-    char date[128], *s, *buf = NULL;
+    char date[128], *s;
     time_t t = time(&t);
     int c;
     kpse_set_progname(argv[0]);
@@ -974,8 +974,7 @@
     *(char *)strchr(date, '\n') = 0;
     cur_file_name = argv[optind];
     if (print_cmap) {
-        buf = xstrdup(cur_file_name);
-        bname = xbasename(buf);
+        bname = strdup(xbasename(cur_file_name));
         if ((s = rindex(bname, '.')) != NULL)
             *s = 0;
     }
@@ -993,7 +992,6 @@
     xfree(Notice);
     xfree(Version);
     xfree(Weight);
-    xfree(buf);
     free_tabs();
     xfclose(fontfile, cur_file_name);
     return 0;


-- 
Olaf Weber

               (This space left blank for technical reasons.)



More information about the tex-live mailing list