diff options
| -rw-r--r-- | recipes/curl/curl-common.inc | 13 | ||||
| -rw-r--r-- | recipes/gnutls/gnutls-native_2.4.2.bb | 4 | ||||
| -rw-r--r-- | recipes/mplayer/files/disable-executable-stack-test.patch | 6 | ||||
| -rw-r--r-- | recipes/mplayer/files/mplayer-arm-pld.patch | 18 | ||||
| -rw-r--r-- | recipes/mplayer/files/mplayer-lavc-arm.patch | 17 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_svn.bb | 2 |
6 files changed, 53 insertions, 7 deletions
diff --git a/recipes/curl/curl-common.inc b/recipes/curl/curl-common.inc index 29af47ee8d..4af85ba58d 100644 --- a/recipes/curl/curl-common.inc +++ b/recipes/curl/curl-common.inc @@ -23,6 +23,11 @@ python __anonymous() { f = bb.data.getVar("CURL_FEATURES", d, True).split(",") oeconf = bb.data.getVar("EXTRA_OECONF", d, False) deps = bb.data.getVar("DEPENDS", d, False).split() + pn = bb.data.getVar("PN", d, True) + if "native" in pn: + native = "-native" + else: + native = "" for x in [ 'cookies', 'crypto-auth', 'dict', 'file', 'ftp', 'http', 'telnet', 'tftp', 'ipv6' ]: if x in f: oeconf += " --enable-%s" % x @@ -30,22 +35,22 @@ python __anonymous() { oeconf += " --disable-%s" % x if 'zlib' in f: oeconf += " --with-zlib=${STAGING_LIBDIR}/../" - deps.append("zlib") + deps.append("zlib" + native) else: oeconf += " --without-zlib" if 'gnutls' in f: oeconf += " --with-gnutls=${STAGING_BINDIR_CROSS}" - deps.append("gnutls") + deps.append("gnutls" + native) else: oeconf += " --without-gnutls" if 'openssl' in f: oeconf += " --with-ssl=${STAGING_LIBDIR}/../" - deps.append("openssl") + deps.append("openssl" + native) else: oeconf += " --without-ssl" if 'ares' in f: oeconf += " --enable-ares" - deps.append("c-ares") + deps.append("c-ares" + native) else: oeconf += " --disable-ares" bb.data.setVar('EXTRA_OECONF', oeconf, d) diff --git a/recipes/gnutls/gnutls-native_2.4.2.bb b/recipes/gnutls/gnutls-native_2.4.2.bb new file mode 100644 index 0000000000..fb896cdb1b --- /dev/null +++ b/recipes/gnutls/gnutls-native_2.4.2.bb @@ -0,0 +1,4 @@ +require gnutls_${PV}.bb + +inherit native + diff --git a/recipes/mplayer/files/disable-executable-stack-test.patch b/recipes/mplayer/files/disable-executable-stack-test.patch index dc8871b6ae..466e62cc8d 100644 --- a/recipes/mplayer/files/disable-executable-stack-test.patch +++ b/recipes/mplayer/files/disable-executable-stack-test.patch @@ -19,12 +19,12 @@ at runtime. -int main(void) { return 0; } -EOF -if cc_check -Wl,-z,noexecstack ; then -- _ld_extra="-Wl,-z,noexecstack $_ld_extra" +- extra_ldflags="-Wl,-z,noexecstack $extra_ldflags" - echores "yes" -else - echores "no" -fi +echores "no" - echocheck "ftello()" - # if we don't have ftello use the osdep/ compatibility module + # Dynamic linking flags + # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) diff --git a/recipes/mplayer/files/mplayer-arm-pld.patch b/recipes/mplayer/files/mplayer-arm-pld.patch new file mode 100644 index 0000000000..b10117e4b3 --- /dev/null +++ b/recipes/mplayer/files/mplayer-arm-pld.patch @@ -0,0 +1,18 @@ +Index: trunk/libmpeg2/motion_comp_arm_s.S +=================================================================== +--- trunk.orig/libmpeg2/motion_comp_arm_s.S 2009-11-11 20:49:15.376079099 +0300 ++++ trunk/libmpeg2/motion_comp_arm_s.S 2009-11-11 20:51:46.468064654 +0300 +@@ -18,6 +18,13 @@ + @ along with mpeg2dec; if not, write to the Free Software + @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++#include "../config.h" ++ ++#if !HAVE_PLD ++.macro pld reg ++.endm ++#endif ++ + + .text + diff --git a/recipes/mplayer/files/mplayer-lavc-arm.patch b/recipes/mplayer/files/mplayer-lavc-arm.patch new file mode 100644 index 0000000000..8c2c832ab3 --- /dev/null +++ b/recipes/mplayer/files/mplayer-lavc-arm.patch @@ -0,0 +1,17 @@ +Index: trunk/libavcodec/arm/dsputil_arm.S +=================================================================== +--- trunk.orig/libavcodec/arm/dsputil_arm.S 2009-11-11 22:16:37.216062301 +0300 ++++ trunk/libavcodec/arm/dsputil_arm.S 2009-11-11 22:22:00.908058155 +0300 +@@ -29,6 +29,12 @@ + .endm + #endif + ++#ifndef __THUMB_INTERWORK__ ++.macro bx reg ++ mov pc, \reg ++.endm ++#endif ++ + #if HAVE_ARMV5TE + function ff_prefetch_arm, export=1 + subs r2, r2, #1 diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 7d2f27aa3a..f9bad67a43 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -9,6 +9,8 @@ RDEPENDS = "mplayer-common" LICENSE = "GPL" SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://makefile-nostrip-svn.patch;patch=1 \ + file://mplayer-arm-pld.patch;patch=1 \ + file://mplayer-lavc-arm.patch;patch=1 \ " SRCREV = "29789" |