X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cf481791c00e9ad0a8636c91f6f040a58d76229c..3b95d7d5c47891169f08be625ee03cd645287881:/package/linux-atm/patches/300-no_autotools.patch?ds=sidebyside

diff --git a/package/linux-atm/patches/300-no_autotools.patch b/package/linux-atm/patches/300-no_autotools.patch
index 73427296c..aa6eb9d93 100644
--- a/package/linux-atm/patches/300-no_autotools.patch
+++ b/package/linux-atm/patches/300-no_autotools.patch
@@ -1,6 +1,7 @@
-diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4
---- linux-atm.old/aclocal.m4	2005-08-23 01:12:10.833789000 +0200
-+++ linux-atm.dev/aclocal.m4	2005-08-23 01:12:44.813623720 +0200
+Index: linux-atm-2.4.1/aclocal.m4
+===================================================================
+--- linux-atm-2.4.1.orig/aclocal.m4	2007-10-20 19:19:11.710295812 +0200
++++ linux-atm-2.4.1/aclocal.m4	2007-10-20 19:19:17.570629771 +0200
 @@ -10,6 +10,825 @@
  dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  dnl PARTICULAR PURPOSE.
@@ -9194,9 +9195,10 @@ diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4
  AC_MSG_RESULT([$SED])
  ])
  
-diff -urN linux-atm.old/configure linux-atm.dev/configure
---- linux-atm.old/configure	2005-08-23 01:12:10.846787000 +0200
-+++ linux-atm.dev/configure	2005-08-23 01:12:41.187175024 +0200
+Index: linux-atm-2.4.1/configure
+===================================================================
+--- linux-atm-2.4.1.orig/configure	2007-10-20 19:19:11.746297861 +0200
++++ linux-atm-2.4.1/configure	2007-10-20 19:19:17.578630228 +0200
 @@ -1,9 +1,8 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -11160,7 +11162,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  
  
 -                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile src/Makefile src/include/Makefile src/lib/Makefile src/test/Makefile src/debug/Makefile src/qgen/Makefile src/saal/Makefile src/sigd/Makefile src/maint/Makefile src/arpd/Makefile src/ilmid/Makefile src/ilmid/asn1/Makefile src/man/Makefile src/led/Makefile src/lane/Makefile src/mpoad/Makefile src/switch/Makefile src/switch/debug/Makefile src/switch/tcp/Makefile src/config/Makefile src/config/init-redhat/Makefile src/extra/Makefile src/extra/linux-atm.spec src/extra/ANS/Makefile"
-+                                                                      ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile src/Makefile src/include/Makefile src/lib/Makefile src/br2684/Makefile"
++                                                                      ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile src/Makefile src/include/Makefile src/lib/Makefile"
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
@@ -11283,7 +11285,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  srcdir=$srcdir
-@@ -9080,27 +9367,7 @@
+@@ -9080,27 +9367,6 @@
    "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    "src/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
    "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
@@ -11308,11 +11310,10 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
 -  "src/extra/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/extra/Makefile" ;;
 -  "src/extra/linux-atm.spec" ) CONFIG_FILES="$CONFIG_FILES src/extra/linux-atm.spec" ;;
 -  "src/extra/ANS/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/extra/ANS/Makefile" ;;
-+  "src/br2684/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/br2684/Makefile" ;;
    "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-@@ -9267,9 +9534,9 @@
+@@ -9267,9 +9533,9 @@
        (echo ':t
    /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
        if test -z "$ac_sed_cmds"; then
@@ -11324,7 +11325,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
        fi
        ac_sed_frag=`expr $ac_sed_frag + 1`
        ac_beg=$ac_end
-@@ -9287,21 +9554,21 @@
+@@ -9287,21 +9553,21 @@
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
    case $ac_file in
    - | *:- | *:-:* ) # input from stdin
@@ -11354,7 +11355,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -9317,10 +9584,10 @@
+@@ -9317,10 +9583,10 @@
        as_dirs="$as_dir $as_dirs"
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -11369,7 +11370,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -9358,12 +9625,45 @@
+@@ -9358,12 +9624,45 @@
      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
      ac_top_srcdir=$ac_top_builddir$srcdir ;;
  esac
@@ -11421,7 +11422,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  
  
    case $INSTALL in
-@@ -9371,11 +9671,6 @@
+@@ -9371,11 +9670,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -11433,7 +11434,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -9385,7 +9680,7 @@
+@@ -9385,7 +9679,7 @@
      configure_input="$ac_file.  "
    fi
    configure_input=$configure_input"Generated from `echo $ac_file_in |
@@ -11442,7 +11443,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  
    # First look for the input files in the build tree, otherwise in the
    # src tree.
-@@ -9394,26 +9689,32 @@
+@@ -9394,26 +9688,32 @@
        case $f in
        -) echo $tmp/stdin ;;
        [\\/$]*)
@@ -11488,7 +11489,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-@@ -9453,12 +9754,12 @@
+@@ -9453,12 +9753,12 @@
  # NAME is the cpp macro being defined and VALUE is the value it is being given.
  #
  # ac_d sets the value in "#define NAME VALUE" lines.
@@ -11504,7 +11505,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  ac_uB='$,\1#\2define\3'
  ac_uC=' '
  ac_uD=',;t'
-@@ -9467,11 +9768,11 @@
+@@ -9467,11 +9767,11 @@
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
    case $ac_file in
    - | *:- | *:-:* ) # input from stdin
@@ -11520,7 +11521,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
    * )   ac_file_in=$ac_file.in ;;
    esac
  
-@@ -9485,28 +9786,29 @@
+@@ -9485,28 +9785,29 @@
        case $f in
        -) echo $tmp/stdin ;;
        [\\/$]*)
@@ -11564,7 +11565,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  
  _ACEOF
  
-@@ -9529,9 +9831,9 @@
+@@ -9529,9 +9830,9 @@
  s,[\\$`],\\&,g
  t clear
  : clear
@@ -11576,7 +11577,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  : end
  _ACEOF
  # If some macros were called several times there might be several times
-@@ -9545,13 +9847,13 @@
+@@ -9545,13 +9846,13 @@
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
  cat >>conftest.undefs <<\_ACEOF
@@ -11592,7 +11593,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
  echo '  :' >>$CONFIG_STATUS
  rm -f conftest.tail
-@@ -9560,7 +9862,7 @@
+@@ -9560,7 +9861,7 @@
    # Write a limited-size here document to $tmp/defines.sed.
    echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
    # Speed up: don't consider the non `#define' lines.
@@ -11601,7 +11602,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
    # Work around the forget-to-reset-the-flag bug.
    echo 't clr' >>$CONFIG_STATUS
    echo ': clr' >>$CONFIG_STATUS
-@@ -9587,7 +9889,7 @@
+@@ -9587,7 +9888,7 @@
    # Write a limited-size here document to $tmp/undefs.sed.
    echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
    # Speed up: don't consider the non `#undef'
@@ -11610,7 +11611,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
    # Work around the forget-to-reset-the-flag bug.
    echo 't clr' >>$CONFIG_STATUS
    echo ': clr' >>$CONFIG_STATUS
-@@ -9621,10 +9923,10 @@
+@@ -9621,10 +9922,10 @@
      else
        ac_dir=`(dirname "$ac_file") 2>/dev/null ||
  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -11625,7 +11626,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -9640,10 +9942,10 @@
+@@ -9640,10 +9941,10 @@
        as_dirs="$as_dir $as_dirs"
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -11640,7 +11641,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -9675,16 +9977,41 @@
+@@ -9675,16 +9976,41 @@
    ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
    ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
  $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -11686,7 +11687,7 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
    ac_builddir=.
  
  if test "$ac_dir" != .; then
-@@ -9710,12 +10037,45 @@
+@@ -9710,12 +10036,45 @@
      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
      ac_top_srcdir=$ac_top_builddir$srcdir ;;
  esac
@@ -11738,9 +11739,10 @@ diff -urN linux-atm.old/configure linux-atm.dev/configure
  
  
    { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-diff -urN linux-atm.old/doc/Makefile.in linux-atm.dev/doc/Makefile.in
---- linux-atm.old/doc/Makefile.in	2005-08-23 01:12:10.885781000 +0200
-+++ linux-atm.dev/doc/Makefile.in	2005-08-23 01:12:46.551359544 +0200
+Index: linux-atm-2.4.1/doc/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/doc/Makefile.in	2007-10-20 19:19:12.494340491 +0200
++++ linux-atm-2.4.1/doc/Makefile.in	2007-10-20 19:19:17.606631822 +0200
 @@ -63,24 +63,35 @@
  host_triplet = @host@
  target_alias = @target_alias@
@@ -11777,9 +11779,10 @@ diff -urN linux-atm.old/doc/Makefile.in linux-atm.dev/doc/Makefile.in
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
-diff -urN linux-atm.old/m4/Makefile.in linux-atm.dev/m4/Makefile.in
---- linux-atm.old/m4/Makefile.in	2005-08-23 01:12:10.850786000 +0200
-+++ linux-atm.dev/m4/Makefile.in	2005-08-23 01:12:46.559358328 +0200
+Index: linux-atm-2.4.1/m4/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/m4/Makefile.in	2007-10-20 19:19:11.778299683 +0200
++++ linux-atm-2.4.1/m4/Makefile.in	2007-10-20 19:19:17.606631822 +0200
 @@ -63,24 +63,35 @@
  host_triplet = @host@
  target_alias = @target_alias@
@@ -11816,9 +11819,10 @@ diff -urN linux-atm.old/m4/Makefile.in linux-atm.dev/m4/Makefile.in
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
-diff -urN linux-atm.old/Makefile.in linux-atm.dev/Makefile.in
---- linux-atm.old/Makefile.in	2005-08-23 01:12:10.830789000 +0200
-+++ linux-atm.dev/Makefile.in	2005-08-23 01:12:46.542360912 +0200
+Index: linux-atm-2.4.1/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/Makefile.in	2007-10-20 19:19:11.698295124 +0200
++++ linux-atm-2.4.1/Makefile.in	2007-10-20 19:19:17.614632281 +0200
 @@ -63,24 +63,35 @@
  host_triplet = @host@
  target_alias = @target_alias@
@@ -11855,42 +11859,10 @@ diff -urN linux-atm.old/Makefile.in linux-atm.dev/Makefile.in
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
-diff -urN linux-atm.old/src/br2684/Makefile.in linux-atm.dev/src/br2684/Makefile.in
---- linux-atm.old/src/br2684/Makefile.in	2005-08-23 01:12:10.884781000 +0200
-+++ linux-atm.dev/src/br2684/Makefile.in	2005-08-23 01:12:46.632347232 +0200
-@@ -57,11 +57,15 @@
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
-+build_alias = @build_alias@
-+build_triplet = @build@
- host_alias = @host_alias@
- host_triplet = @host@
-+target_alias = @target_alias@
-+target_triplet = @target@
- AR = @AR@
- AS = @AS@
--CC = /usr/src/openwrt/staging_dir_mipsel/bin/mipsel-linux-gcc
-+CC = @CC@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- DLLTOOL = @DLLTOOL@
-@@ -117,9 +121,9 @@
- br2684ctl_DEPENDENCIES =  $(top_builddir)/src/lib/libatm.la
- br2684ctl_LDFLAGS = 
- CFLAGS = @CFLAGS@
--COMPILE = $(TARGET_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(TARGET_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(TARGET_CC)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- man8dir = $(mandir)/man8
- MANS = $(man_MANS)
-diff -urN linux-atm.old/src/include/Makefile.in linux-atm.dev/src/include/Makefile.in
---- linux-atm.old/src/include/Makefile.in	2005-08-23 01:12:10.851786000 +0200
-+++ linux-atm.dev/src/include/Makefile.in	2005-08-23 01:12:46.585354376 +0200
+Index: linux-atm-2.4.1/src/include/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/include/Makefile.in	2007-10-20 19:19:11.798300823 +0200
++++ linux-atm-2.4.1/src/include/Makefile.in	2007-10-20 19:19:17.626632961 +0200
 @@ -63,24 +63,35 @@
  host_triplet = @host@
  target_alias = @target_alias@
@@ -11927,9 +11899,10 @@ diff -urN linux-atm.old/src/include/Makefile.in linux-atm.dev/src/include/Makefi
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
-diff -urN linux-atm.old/src/lib/Makefile.in linux-atm.dev/src/lib/Makefile.in
---- linux-atm.old/src/lib/Makefile.in	2005-08-23 01:12:10.852786000 +0200
-+++ linux-atm.dev/src/lib/Makefile.in	2005-08-23 01:12:46.607351032 +0200
+Index: linux-atm-2.4.1/src/lib/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/lib/Makefile.in	2007-10-20 19:19:11.806301281 +0200
++++ linux-atm-2.4.1/src/lib/Makefile.in	2007-10-20 19:19:17.642633872 +0200
 @@ -65,24 +65,35 @@
  host_triplet = @host@
  target_alias = @target_alias@
@@ -11966,9 +11939,10 @@ diff -urN linux-atm.old/src/lib/Makefile.in linux-atm.dev/src/lib/Makefile.in
  STRIP = @STRIP@
  VERSION = @VERSION@
  YACC = @YACC@
-diff -urN linux-atm.old/src/Makefile.in linux-atm.dev/src/Makefile.in
---- linux-atm.old/src/Makefile.in	2005-08-23 01:12:10.851786000 +0200
-+++ linux-atm.dev/src/Makefile.in	2005-08-23 01:12:46.572356352 +0200
+Index: linux-atm-2.4.1/src/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/Makefile.in	2007-10-20 19:19:11.790300372 +0200
++++ linux-atm-2.4.1/src/Makefile.in	2007-10-20 19:19:17.650634330 +0200
 @@ -63,30 +63,40 @@
  host_triplet = @host@
  target_alias = @target_alias@
@@ -12008,7 +11982,47 @@ diff -urN linux-atm.old/src/Makefile.in linux-atm.dev/src/Makefile.in
  
 -SUBDIRS = include lib 
 -
-+SUBDIRS = include lib br2684
++SUBDIRS = include lib
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
+Index: linux-atm-2.4.1/src/arpd/Makefile.in
+===================================================================
+--- linux-atm-2.4.1.orig/src/arpd/Makefile.in	2007-10-20 19:19:12.126319517 +0200
++++ linux-atm-2.4.1/src/arpd/Makefile.in	2007-10-20 19:19:17.654634561 +0200
+@@ -63,24 +63,35 @@
+ host_triplet = @host@
+ target_alias = @target_alias@
+ target_triplet = @target@
++AR = @AR@
+ AS = @AS@
+ CC = @CC@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++GCJ = @GCJ@
++GCJFLAGS = @GCJFLAGS@
++HAVE_LIB = @HAVE_LIB@
+ LEX = @LEX@
++LIB = @LIB@
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LIBVER_AGE = @LIBVER_AGE@
+ LIBVER_CURRENT = @LIBVER_CURRENT@
+ LIBVER_REVISION = @LIBVER_REVISION@
+ LN_S = @LN_S@
++LTLIB = @LTLIB@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PERL = @PERL@
+ RANLIB = @RANLIB@
++RC = @RC@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ YACC = @YACC@