X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/5167a6f45e1af069e75951a6bb0ffc237e5d018d..e973943aa376bda8430c3a17f0c8e0f8a8999bd2:/package/ifxmips-dsl-api/patches/500-portability.patch?ds=sidebyside

diff --git a/package/ifxmips-dsl-api/patches/500-portability.patch b/package/ifxmips-dsl-api/patches/500-portability.patch
index cbac514f2..849d1286f 100644
--- a/package/ifxmips-dsl-api/patches/500-portability.patch
+++ b/package/ifxmips-dsl-api/patches/500-portability.patch
@@ -1,6 +1,17 @@
---- a/configure.in
-+++ b/configure.in
-@@ -333,12 +333,12 @@ AC_ARG_ENABLE(ifxos-include,
+Index: drv_dsl_cpe_api-3.24.4.4/configure.in
+===================================================================
+--- drv_dsl_cpe_api-3.24.4.4.orig/configure.in	2009-08-13 13:39:21.000000000 +0200
++++ drv_dsl_cpe_api-3.24.4.4/configure.in	2010-11-01 12:58:37.000000000 +0100
+@@ -310,7 +310,7 @@
+ AC_ARG_ENABLE(kernelbuild,
+     AC_HELP_STRING(--enable-kernel-build=x,Set the target kernel build path),
+     [
+-        if test -e $enableval/include/linux/autoconf.h; then
++        if test -e $enableval/include/linux/autoconf.h -o -e $enableval/include/generated/autoconf.h; then
+             AC_SUBST([KERNEL_BUILD_PATH],[$enableval])
+         else
+             AC_MSG_ERROR([The kernel build directory is not valid or not configured!])
+@@ -333,12 +333,12 @@
              echo Set the lib_ifxos include path $enableval
              AC_SUBST([IFXOS_INCLUDE_PATH],[$enableval])
          else
@@ -15,7 +26,7 @@
          AC_SUBST([IFXOS_INCLUDE_PATH],[$DEFAULT_IFXOS_INCLUDE_PATH])
      ]
  )
-@@ -1702,73 +1702,73 @@ dnl Set the configure params for dist ch
+@@ -1702,73 +1702,73 @@
  AC_SUBST([DISTCHECK_CONFIGURE_PARAMS],[$CONFIGURE_OPTIONS])
  
  AC_CONFIG_COMMANDS_PRE([
@@ -156,9 +167,11 @@
  ])
  
  AC_CONFIG_FILES([Makefile src/Makefile])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -303,7 +303,7 @@ if KERNEL_2_6
+Index: drv_dsl_cpe_api-3.24.4.4/src/Makefile.am
+===================================================================
+--- drv_dsl_cpe_api-3.24.4.4.orig/src/Makefile.am	2009-07-03 14:06:34.000000000 +0200
++++ drv_dsl_cpe_api-3.24.4.4/src/Makefile.am	2010-11-01 12:58:37.000000000 +0100
+@@ -303,7 +303,7 @@
  drv_dsl_cpe_api_OBJS = "$(subst .c,.o,$(filter %.c,$(drv_dsl_cpe_api_SOURCES)))"
  
  drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SOURCES)
@@ -167,7 +180,7 @@
  	if test ! -e common/drv_dsl_cpe_api.c ; then \
  		echo "copy source files (as links only!)"; \
  		for f in $(filter %.c,$(drv_dsl_cpe_api_SOURCES)); do \
-@@ -311,10 +311,10 @@ drv_dsl_cpe_api.ko: $(drv_dsl_cpe_api_SO
+@@ -311,10 +311,10 @@
  			cp -s $(addprefix @abs_srcdir@/,$$f) $(PWD)/`dirname $$f`/ ; \
  		done \
  	fi