org.handhelds.familiar/packages/twin/twin-0.4.6/cross_compile.patch

   1 diff -urNd ../twin-0.4.6-r0/twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in
   2 --- ../twin-0.4.6-r0/twin-0.4.6/Makefile.in     2003-03-27 08:29:47 +00:00
   3 +++ twin-0.4.6/Makefile.in      2004-07-27 13:04:46 +01:00
   4 @@ -71,33 +71,33 @@
   5  # to correctly generate include/autoconf.h
   6  #
   7
   8 -ADMIN_LIBTOOLS:=admin/ltmain.sh admin/config.guess admin/config.sub
   9 +#ADMIN_LIBTOOLS:=admin/ltmain.sh admin/config.guess admin/config.sub
  10
  11 -$(ADMIN_LIBTOOLS):
  12 -       libtoolize -c
  13 +#$(ADMIN_LIBTOOLS):
  14 +#      libtoolize -c
  15
  16 -ADMIN_ACLOCAL:=admin/aclocal.m4
  17 +#ADMIN_ACLOCAL:=admin/aclocal.m4
  18
  19 -DISTCLEAN_EMPTY_FILES:=$(ADMIN_ACLOCAL) $(ADMIN_LIBTOOLS)
  20 +#DISTCLEAN_EMPTY_FILES:=$(ADMIN_ACLOCAL) $(ADMIN_LIBTOOLS)
  21
  22 -$(ADMIN_ACLOCAL):
  23 -       @if [ -f /usr/share/aclocal/libtool.m4 ]; then \
  24 -         echo $(LN) /usr/share/aclocal/libtool.m4 $@ ; \
  25 -         $(LN) /usr/share/aclocal/libtool.m4 $@ ; \
  26 -       else \
  27 -         echo touch $@; \
  28 -         touch $@; \
  29 -       fi
  30 +#$(ADMIN_ACLOCAL):
  31 +#      @if [ -f /usr/share/aclocal/libtool.m4 ]; then \
  32 +#        echo $(LN) /usr/share/aclocal/libtool.m4 $@ ; \
  33 +#        $(LN) /usr/share/aclocal/libtool.m4 $@ ; \
  34 +#      else \
  35 +#        echo touch $@; \
  36 +#        touch $@; \
  37 +#      fi
  38
  39 -configure: configure.in $(ADMIN_LIBTOOLS) $(ADMIN_ACLOCAL) include/autoconf.h.in
  40 -       rm -f $@ && autoconf --localdir=admin
  41 +#configure: configure.in $(ADMIN_LIBTOOLS) $(ADMIN_ACLOCAL) include/autoconf.h.in
  42 +#      rm -f $@ && autoconf
  43
  44 -include/autoconf.h.in: configure.in
  45 -       rm -f $@ && autoheader
  46 +#include/autoconf.h.in: configure.in
  47 +#      rm -f $@ && autoheader
  48
  49 -config.status libtool: configure $(ADMIN_LIBTOOLS)
  50 -       @echo Updating config.status libtool
  51 -       ./configure --cache-file=config.cache --no-create
  52 +#config.status libtool: configure $(ADMIN_LIBTOOLS)
  53 +#      @echo Updating config.status libtool
  54 +#      ./configure --host --cache-file=config.cache --no-create
  55
  56  #
  57  # was:
  58 diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure twin-0.4.6/configure
  59 --- ../twin-0.4.6-r0/twin-0.4.6/configure       2003-03-27 08:29:47 +00:00
  60 +++ twin-0.4.6/configure        2004-07-27 13:11:21 +01:00
  61 @@ -1235,7 +1235,7 @@
  62
  63  make_is_good=no
  64  if test "${MAKE-make}"; then
  65 -  ${MAKE-make} -v | head -1 | cut -d' ' -f1-4 | cut -d, -f1 | \
  66 +  ${MAKE-make} -v | head -n 1 | cut -d' ' -f1-4 | cut -d, -f1 | \
  67    while read make_GNU make_Make make_version make_numbers
  68    do
  69      if test "$make_GNU" = "GNU" -a "$make_Make" = "Make"; then
  70 @@ -2167,7 +2167,7 @@
  71    lt_cv_file_magic_cmd='/usr/bin/file -L'
  72    case "$host_os" in
  73    rhapsody* | darwin1.[012])
  74 -    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
  75 +    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
  76      ;;
  77    *) # Darwin 1.3 on
  78      lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
  79 @@ -3670,7 +3670,7 @@
  80      # If the export-symbols file already is a .def file (1st line
  81      # is EXPORTS), use it as is.
  82      # If DATA tags from a recent dlltool are present, honour them!
  83 -    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
  84 +    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
  85         cp $export_symbols $output_objdir/$soname-def;
  86        else
  87         echo EXPORTS > $output_objdir/$soname-def;
  88 diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure.in twin-0.4.6/configure.in
  89 --- ../twin-0.4.6-r0/twin-0.4.6/configure.in    2003-03-27 08:29:47 +00:00
  90 +++ twin-0.4.6/configure.in     2004-07-27 13:18:07 +01:00
  91 @@ -188,7 +188,7 @@
  92
  93  make_is_good=no
  94  if test "${MAKE-make}"; then
  95 -  ${MAKE-make} -v | head -1 | cut -d' ' -f1-4 | cut -d, -f1 | \
  96 +  ${MAKE-make} -v | head -n 1 | cut -d' ' -f1-4 | cut -d, -f1 | \
  97    while read make_GNU make_Make make_version make_numbers
  98    do
  99      if test "$make_GNU" = "GNU" -a "$make_Make" = "Make"; then
 100 @@ -378,7 +378,16 @@
 101                select strdup strerror strspn strstr scandir alphasort uname \
 102                vprintf vsprintf vsnprintf wait3 wait4 getpt grantpt unlockpt ptsname)
 103
 104 -AC_CHECK_FILE(/dev/ptmx)
 105 +AC_SEARCH_LIBS(openpty,util,
 106 +   [
 107 +       AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function])
 108 +       no_dev_ptmx=yes
 109 +   ])
 110 +AC_CHECK_FUNCS([_getpty])
 111 +if test -z "$no_dev_ptmx" ; then
 112 +    AC_CHECK_FILE(/dev/ptmx)
 113 +fi
 114 +
 115  AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt,crypt))
 116  AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen))
 117  AC_CHECK_LIB(ltdl,lt_dlopen)
 118 diff -urNd ../twin-0.4.6-r0/twin-0.4.6/makerules twin-0.4.6/makerules
 119 --- ../twin-0.4.6-r0/twin-0.4.6/makerules       2003-03-27 08:29:48 +00:00
 120 +++ twin-0.4.6/makerules        2004-07-27 13:04:46 +01:00
 121 @@ -794,7 +794,7 @@
 122  endif
 123
 124  $(TOPDIR)/scripts/Getsizes: $(TOPDIR)/scripts/getsizes.c $(TOPDIR)/include/Tw/datatypes.h $(TOPDIR)/include/autoconf.h
 125 -       $(CC) $(CC_FLAGS) $(CC_FLAGS_script_getsizes.o) $(LD_FLAGS) $< -o $@
 126 +       $(HOSTCC) $(CC_FLAGS) $(CC_FLAGS_script_getsizes.o) $(LD_FLAGS) $< -o $@
 127         @echo "PREVIOUS_CONF__LONG_LONG=$(CONF__LONG_LONG)" > $(TOPDIR)/.long_long.conf
 128
 129  #
 130 @@ -802,10 +802,10 @@
 131  # but this is the best place to force creating it
 132  #
 133  $(TOPDIR)/scripts/Mkdep: $(TOPDIR)/scripts/mkdep.c $(TOPDIR)/include/autoconf.h $(TOPDIR)/include/Tw/datasizes.h
 134 -       $(CC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@
 135 +       $(HOSTCC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@
 136
 137  $(TOPDIR)/scripts/Bitmap: $(TOPDIR)/scripts/bitmap.c
 138 -       $(CC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@
 139 +       $(HOSTCC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@
 140
 141
 142  #
 143 diff -urNd ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c twin-0.4.6/scripts/mkdep.c
 144 --- ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c 2003-03-27 08:29:48 +00:00
 145 +++ twin-0.4.6/scripts/mkdep.c  2004-07-27 13:04:46 +01:00
 146 @@ -172,8 +172,8 @@
 147         putchar('\n');
 148  }
 149
 150 -static char str_path[3][512];
 151 -static int  len_path[3];
 152 +static char str_path[20][512];
 153 +static int  len_path[20];
 154  static int  max_path = 0;
 155  static int  limit_path = sizeof(len_path)/sizeof(len_path[0]);
 156