summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2006-09-10 02:43:53 +0000
committerJamie Lenehan <lenehan@twibble.org>2006-09-10 02:43:53 +0000
commit1d545ebf6ef93aa20d71c8527f2e9783729839dc (patch)
treea78f7c163ab4472a38f5c2a5ca2c6a6ed398a7e3
parent84d7c28c9f3500d75d9ef71a0214259e8c9eea40 (diff)
libpng 1.2.12: Disable the use of x86 assembler code. When building
for i586 or i686 it attempts to use the assembler code but does not link it in, so either the assembly code needs to be disabled or the makefiles patch to link in the assembly code. Closes #1326.
-rw-r--r--packages/libpng/1.2.12/.mtn2git_empty0
-rw-r--r--packages/libpng/libpng-1.2.12/.mtn2git_empty0
-rw-r--r--packages/libpng/libpng_1.2.12.bb1
3 files changed, 1 insertions, 0 deletions
diff --git a/packages/libpng/1.2.12/.mtn2git_empty b/packages/libpng/1.2.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libpng/1.2.12/.mtn2git_empty
diff --git a/packages/libpng/libpng-1.2.12/.mtn2git_empty b/packages/libpng/libpng-1.2.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libpng/libpng-1.2.12/.mtn2git_empty
diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
index 24117cb0ef..66b691b617 100644
--- a/packages/libpng/libpng_1.2.12.bb
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -24,6 +24,7 @@ S = "${WORKDIR}/libpng-${PV}"
inherit pkgconfig binconfig pkgconfig
EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
+CFLAGS += "-DPNG_NO_ASSEMBLER_CODE"
do_compile() {
sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'