Browse Source

Merge branch 'master' of git+ssh://openadk.org/git/openadk

Waldemar Brodkorb 14 years ago
parent
commit
a3e0d02b1c

+ 10 - 1
package/cups/patches/patch-configure

@@ -1,5 +1,5 @@
 --- cups-1.4.4.orig/configure	2010-06-17 20:25:47.000000000 +0200
-+++ cups-1.4.4/configure	2010-10-03 01:12:27.000000000 +0200
++++ cups-1.4.4/configure	2011-07-29 16:46:45.000000000 +0200
 @@ -1966,7 +1966,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -29,3 +29,12 @@
  fi
  
  if test x$enable_debug_printfs = xyes; then
+@@ -11199,7 +11199,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  PIEFLAGS="-pie -fPIE"
++  PIEFLAGS=""
+ 		{ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else

+ 1 - 1
package/libxslt/Makefile

@@ -42,7 +42,7 @@ xsltproc-install:
 
 libxslt-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/lib?xslt.so* ${IDIR_LIBXSLT}/usr/lib
 
 libxslt-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/include

+ 1 - 0
target/linux/config/Config.in.netdevice

@@ -256,6 +256,7 @@ config ADK_KERNEL_MAC80211_LEDS
 	boolean
 	select ADK_KPACKAGE_KMOD_LEDS_CLASS
 	select ADK_KERNEL_NEW_LEDS
+	select ADK_KERNEL_LEDS_TRIGGERS
 
 config ADK_KERNEL_WLAN_80211
 	boolean