File libart_lgpl-2.3.20-crosscompile.patch of Package mingw32-libart_lgpl

Overview Repositories Revisions Requests Users Attributes Meta

File libart_lgpl-2.3.20-crosscompile.patch of Package mingw32-libart_lgpl (Revision 377fdc9ba2a4cdf968913c2ae76af8ab)

Currently displaying revision 377fdc9ba2a4cdf968913c2ae76af8ab , Show latest

--- libart_lgpl-2.3.20/configure.in	2008-01-30 09:59:25.000000000 +0100
+++ libart_lgpl-2.3.20/configure.in	2009-01-14 09:09:17.000000000 +0100
@@ -92,6 +92,15 @@
 
 AC_C_BIGENDIAN
 
+AC_CHECK_SIZEOF(char)
+AC_SUBST(ART_SIZEOF_CHAR, $ac_cv_sizeof_char)
+AC_CHECK_SIZEOF(short)
+AC_SUBST(ART_SIZEOF_SHORT, $ac_cv_sizeof_short)
+AC_CHECK_SIZEOF(int)
+AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
+AC_CHECK_SIZEOF(long)
+AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
+
 AC_CONFIG_FILES([
 libart-features.h
 Makefile
@@ -100,5 +109,6 @@
 libart-zip])
 
 AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
+AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
 
 AC_OUTPUT
diff -u -N -r libart_lgpl-2.3.20/gen_art_config.c libart_lgpl-2.3.20/gen_art_config.c
--- libart_lgpl-2.3.20/gen_art_config.c	2007-10-19 10:36:03.000000000 +0200
+++ libart_lgpl-2.3.20/gen_art_config.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include "config.h"
-#include <stdlib.h>
-
-/**
- * A little utility function to generate header info.
- *
- * Yes, it would be possible to do this using more "native" autoconf
- * features, but I personally find this approach to be cleaner.
- *
- * The output of this program is generally written to art_config.h,
- * which is installed in libart's include dir.
- **/
-
-static void
-die (char *why)
-{
-  fprintf (stderr, "gen_art_config: %s\n", why);
-  exit (1);
-}
-
-int
-main (int argc, char **argv)
-{
-  printf ("/* Automatically generated by gen_art_config.c */\n"
-	  "\n"
-	  "#define ART_SIZEOF_CHAR %d\n"
-	  "#define ART_SIZEOF_SHORT %d\n"
-	  "#define ART_SIZEOF_INT %d\n"
-	  "#define ART_SIZEOF_LONG %d\n"
-	  "\n",
-	  (int)sizeof(char), (int)sizeof(short), (int)sizeof(int), (int)sizeof(long));
-
-  if (sizeof(char) == 1)
-    printf ("typedef unsigned char art_u8;\n");
-  else
-    die ("sizeof(char) != 1");
-
-  if (sizeof(short) == 2)
-    printf ("typedef unsigned short art_u16;\n");
-  else
-    die ("sizeof(short) != 2");
-
-  if (sizeof(int) == 4)
-    printf ("typedef unsigned int art_u32;\n");
-  else if (sizeof(long) == 4)
-    printf ("typedef unsigned long art_u32;\n");
-  else
-    die ("sizeof(int) != 4 and sizeof(long) != 4");
-
-  return 0;
-}
diff -u -N -r libart_lgpl-2.3.20/gen_art_config.in libart_lgpl-2.3.20/gen_art_config.in
--- libart_lgpl-2.3.20/gen_art_config.sh.in	1970-01-01 01:00:00.000000000 +0100
+++ libart_lgpl-2.3.20/gen_art_config.sh.in	2009-01-14 09:09:56.000000000 +0100
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# A little utility function to generate header info.
+#
+# The output of this program is generally written to art_config.h,
+# which is installed in libart's include dir.
+
+
+echo "/* Automatically generated by gen_art_config */"
+echo
+echo "#define ART_SIZEOF_CHAR @ART_SIZEOF_CHAR@"
+echo "#define ART_SIZEOF_SHORT @ART_SIZEOF_SHORT@"
+echo "#define ART_SIZEOF_INT @ART_SIZEOF_INT@"
+echo "#define ART_SIZEOF_LONG @ART_SIZEOF_LONG@"
+echo
+
+if test @ART_SIZEOF_CHAR@ -eq 1; then
+  echo "typedef unsigned char art_u8;"
+else
+  echo 1>&2 "sizeof(char) != 1"
+  exit 1
+fi
+
+if test @ART_SIZEOF_SHORT@ -eq 2; then
+  echo "typedef unsigned short art_u16;"
+else
+  echo 1>&2 "sizeof(short) != 2"
+  exit 2
+fi
+
+if test @ART_SIZEOF_INT@ -eq 4; then
+  echo "typedef unsigned int art_u32;"
+else
+  if test @ART_SIZEOF_LONG@ -eq 4; then
+    echo "typedef unsigned long art_u32;"
+  else
+    echo 1>&2 "sizeof(int) != 4 and sizeof(long) != 4"
+	exit 3
+  fi
+fi
+
+exit 0
+}
diff -u -N -r libart_lgpl-2.3.20/Makefile.am libart_lgpl-2.3.20/Makefile.am
--- libart_lgpl-2.3.20/Makefile.am	2007-10-19 10:36:03.000000000 +0200
+++ libart_lgpl-2.3.20/Makefile.am	2009-01-14 09:17:59.000000000 +0100
@@ -1,12 +1,14 @@
-noinst_PROGRAMS = testart testuta gen_art_config
+noinst_PROGRAMS = testart testuta
 
 bin_SCRIPTS = \
 	libart2-config
+	
+noinst_SCRIPTS = gen_art_config.sh
 
 BUILT_SOURCES = art_config.h
 
-art_config.h:	gen_art_config$(EXEEXT)
-	./gen_art_config > art_config.h
+art_config.h:
+	./gen_art_config.sh > art_config.h
 
 EXTRA_DIST = 			\
 	libart.def		\

Places

File libart_lgpl-2.3.20-crosscompile.patch of Package mingw32-libart_lgpl (Revision 377fdc9ba2a4cdf968913c2ae76af8ab)

Places