http://bugs.openembedded.org/show_bug.cgi?id=1326

           Summary: libpng doesn't build for x86
           Product: Openembedded
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: Build
        AssignedTo: [email protected]
        ReportedBy: [EMAIL PROTECTED]
         QAContact: [EMAIL PROTECTED]


When building libpng for x86 it defaults to using the x86 assembler code, but
the files that actual contain that code are not being linked in.

I see two obvious options for fixing this:


1) Disbable the assemble code:

--- packages/libpng/libpng_1.2.12.bb   
dc1e09b684e60937bbf8e53e7f05696e980de98f
+++ packages/libpng/libpng_1.2.12.bb   
57c470e1a0907005d984c78703810a061271dba9
@@ -24,6 +24,7 @@ EXTRA_OEMAKE_append = " ZLIBINC=${STAGIN
 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.*//'


2) Include the assembler code in the library:

--- packages/libpng/libpng-1.2.12/add-assembler-files.patch    
645086d24b651566dbbbc101b772819ee517136a
+++ packages/libpng/libpng-1.2.12/add-assembler-files.patch    
645086d24b651566dbbbc101b772819ee517136a
@@ -0,0 +1,20 @@
+We need to include the files that contain the assembler code for x86.
+
+--- libpng-1.2.12/scripts/makefile.linux       2006/08/17 03:47:35     1.1
++++ libpng-1.2.12/scripts/makefile.linux       2006/08/17 03:48:17
+@@ -75,7 +75,7 @@
+
+ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
+       pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
+-      pngwtran.o pngmem.o pngerror.o pngpread.o
++      pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o
+
+ OBJSDLL = $(OBJS:.o=.pic.o)
+
+@@ -241,5 +241,5 @@
+ pngwtran.o pngwtran.pic.o: png.h pngconf.h
+ pngwutil.o pngwutil.pic.o: png.h pngconf.h
+ pngpread.o pngpread.pic.o: png.h pngconf.h
+-
++pnggccrd.o pnggccrd.pic.o: png.h pngconf.h
+ pngtest.o: png.h pngconf.h
============================================================
--- packages/libpng/libpng_1.2.12.bb   
dc1e09b684e60937bbf8e53e7f05696e980de98f
+++ packages/libpng/libpng_1.2.12.bb   
2a796a0c3f57cd1246bc1711a7aa57c182ef3156
@@ -18,7 +18,8 @@ FILES_${PN}-dev = ${includedir} ${libdir
                ${libdir}/*.a ${libdir}/pkgconfig \
                ${datadir}/aclocal ${bindir} ${sbindir}

-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2; \
+          file://add-assembler-files.patch;patch=1"
 S = "${WORKDIR}/libpng-${PV}"

 inherit pkgconfig binconfig pkgconfig


-- 
Configure bugmail: http://bugs.openembedded.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
_______________________________________________
Oe mailing list
[email protected]
https://www.handhelds.org/mailman/listinfo/oe

Reply via email to