summaryrefslogtreecommitdiff
path: root/package/libpthread
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-27 15:13:43 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-27 15:13:43 +0200
commit80e12557d5fbe312887fe8fbb7056ff764e9a736 (patch)
tree873a386a81e685f464dfdc3822e95a93950d7a32 /package/libpthread
parent732f97744f333f3c80b68cdcc4b067722547cf06 (diff)
parent8f4b5ed938071262638928deaf18552040360f4a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libpthread')
-rw-r--r--package/libpthread/Makefile2
-rw-r--r--package/libpthread/files/libpthread.so.arm5
2 files changed, 6 insertions, 1 deletions
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index 4d61d570a..ed0602c86 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -49,7 +49,7 @@ endif
libpthread-dev-install:
ifeq ($(ADK_NATIVE),)
${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib
- ${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so
+ -${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so
${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib
endif
diff --git a/package/libpthread/files/libpthread.so.arm b/package/libpthread/files/libpthread.so.arm
new file mode 100644
index 000000000..73f6b6c9d
--- /dev/null
+++ b/package/libpthread/files/libpthread.so.arm
@@ -0,0 +1,5 @@
+/* GNU ld script
+ Use the shared library, but some functions are only in
+ the static library, so try that secondarily. */
+OUTPUT_FORMAT(elf32-arm)
+GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )