diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-30 19:53:47 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-30 19:53:47 +0200 |
| commit | a3e0d02b1c8b618fdfc0454560f75e678e0d68c0 (patch) | |
| tree | 87c448f2491588b8f917d56e2d8ad6077c449aca | |
| parent | ee9a8efcee8c69c6c3f15c5dc0165fbf1196a019 (diff) | |
| parent | e9fe392f1660acc2bfaded4acc18b376830959de (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/cups/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/libxslt/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/package/cups/patches/patch-configure b/package/cups/patches/patch-configure index 5b41c2edd..97243c0c9 100644 --- a/package/cups/patches/patch-configure +++ b/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 diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index c5a9692ed..b82a80281 100644 --- a/package/libxslt/Makefile +++ b/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 diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index edd991f97..14820b810 100644 --- a/target/linux/config/Config.in.netdevice +++ b/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 |