fix allconfig for foxg20

13 files changed, 112 insertions, 2 deletions

diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 503468257..f25372af8 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -28,6 +28,9 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+ifeq ($(TARGET_ARCH),arm)
+TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
+endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-tee=yes \
 			--enable-xlib=yes
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 8b7a96504..02ee6936d 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -18,6 +18,8 @@ PKG_SUBPKGS:=		DBUS DBUS_DEV
 PKGSC_DBUS_DEV:=	devel
 PKGSD_DBUS_DEV:=	DBUS headers
 
+PKG_ARCH_DEPENDS:=	!arm
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
index e5bce5132..1aa31b56b 100644
--- a/package/dbus/patches/patch-configure
+++ b/package/dbus/patches/patch-configure
@@ -1,5 +1,14 @@
 --- dbus-1.4.6.orig/configure	2011-02-17 21:06:57.000000000 +0100
-+++ dbus-1.4.6/configure	2011-04-13 04:47:38.000000000 +0200
++++ dbus-1.4.6/configure	2011-04-26 16:00:48.797847993 +0200
+@@ -18718,7 +18718,7 @@ DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_
+ 
+ 
+ DBUS_BUS_CFLAGS="$XML_CFLAGS"
+-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs"
++DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $ADT_LIBS $NETWORK_libs"
+ 
+ 
+ 
 @@ -19608,18 +19608,6 @@ if test "x$GCC" = "xyes"; then
       ;;
    esac
diff --git a/package/fontconfig/patches/patch-fontconfig_pc_in b/package/fontconfig/patches/patch-fontconfig_pc_in
new file mode 100644
index 000000000..b2670b8df
--- /dev/null
+++ b/package/fontconfig/patches/patch-fontconfig_pc_in
@@ -0,0 +1,9 @@
+--- fontconfig-2.8.0.orig/fontconfig.pc.in	2009-11-16 18:24:52.000000000 +0100
++++ fontconfig-2.8.0/fontconfig.pc.in	2011-04-25 18:08:32.487672440 +0200
+@@ -7,5 +7,5 @@ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@
++Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -lfreetype -lz @ICONV_LIBS@
+ Cflags: -I${includedir}
diff --git a/package/fuse/patches/patch-fuse_pc_in b/package/fuse/patches/patch-fuse_pc_in
new file mode 100644
index 000000000..9f21cd567
--- /dev/null
+++ b/package/fuse/patches/patch-fuse_pc_in
@@ -0,0 +1,9 @@
+--- fuse-2.7.4.orig/fuse.pc.in	2008-02-19 20:51:21.000000000 +0100
++++ fuse-2.7.4/fuse.pc.in	2011-04-25 18:02:20.087672599 +0200
+@@ -6,5 +6,5 @@ includedir=@includedir@
+ Name: fuse
+ Description: Filesystem in Userspace
+ Version: @VERSION@
+-Libs: -L${libdir} -lfuse @libfuse_libs@
++Libs: -L${libdir} -lfuse
+ Cflags: -I${includedir}/fuse -D_FILE_OFFSET_BITS=64
diff --git a/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in b/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in
new file mode 100644
index 000000000..ae45cef82
--- /dev/null
+++ b/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in
@@ -0,0 +1,10 @@
+--- gdk-pixbuf-2.23.1.orig/gdk-pixbuf-2.0.pc.in	2010-11-30 03:37:47.000000000 +0100
++++ gdk-pixbuf-2.23.1/gdk-pixbuf-2.0.pc.in	2011-04-25 18:07:16.917662321 +0200
+@@ -13,6 +13,6 @@ Description: Image loading and scaling
+ Version: @VERSION@
+ Requires: gobject-2.0
+ Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
+-Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
++Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ -ltiff -ljpeg -lpng12 -lm 
+ Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
+ 
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 )
diff --git a/package/neon/patches/patch-neon_pc_in b/package/neon/patches/patch-neon_pc_in
new file mode 100644
index 000000000..7ae4faf9a
--- /dev/null
+++ b/package/neon/patches/patch-neon_pc_in
@@ -0,0 +1,10 @@
+--- neon-0.29.5.orig/neon.pc.in	2006-06-26 12:01:29.000000000 +0200
++++ neon-0.29.5/neon.pc.in	2011-04-25 18:11:35.518922624 +0200
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: neon
+ Description: HTTP/WebDAV client library
+ Version: @NEON_VERSION@
+-Libs.private: @NEON_LIBS@
++Libs.private: -lz -lssl -lcrypto -ldl -lxml2 -lm
+ Libs: -L${libdir} -lneon @NEON_PC_LIBS@
+ Cflags: -I${includedir}/neon @NEON_CFLAGS@
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 8d0da3e2c..08d80e4c4 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -24,6 +24,8 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://icedtea.classpath.org/download/drops/ \
 			http://icedtea.classpath.org/download/source/
 
+PKG_CFLINE_OPENJDK:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
 # autotools infrastructure for OpenJDK
 ICEDTEA_NAME:=		icedtea6
 ICEDTEA_VERSION:=	1.10
diff --git a/package/openjdk/patches/iconv.patch b/package/openjdk/patches/iconv.patch
new file mode 100644
index 000000000..16a6946f6
--- /dev/null
+++ b/package/openjdk/patches/iconv.patch
@@ -0,0 +1,49 @@
+diff -Nur w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make
+--- w-openjdk-6.orig/openjdk-6/hotspot/make/linux/makefiles/gcc.make	2011-02-28 17:03:13.000000000 +0100
++++ w-openjdk-6/openjdk-6/hotspot/make/linux/makefiles/gcc.make	2011-04-11 18:36:16.837665258 +0200
+@@ -108,9 +108,6 @@
+   CFLAGS += -pipe
+ endif
+ 
+-# Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
+-
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+ # conversions which might affect the values. To avoid that, we need to turn
+diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/instrument/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/instrument/Makefile	2011-04-11 23:14:27.571411016 +0200
+@@ -123,6 +123,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ #
+ # Add to ambient vpath so we pick up the library files
+ #
+diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/npt/Makefile	2011-02-28 17:06:11.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/npt/Makefile	2011-04-11 23:14:07.017670197 +0200
+@@ -65,6 +65,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ # Add -export options to explicitly spell exported symbols
+ ifeq ($(PLATFORM), windows)
+   OTHER_LCF += -export:nptInitialize -export:nptTerminate
+diff -Nur w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile
+--- w-openjdk-6.orig/openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-02-28 17:06:12.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/sun/splashscreen/Makefile	2011-04-11 23:15:07.221411030 +0200
+@@ -55,6 +55,8 @@
+ 
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ #
+ # C Flags
+ #
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index 9533b97c9..ec6477779 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://pcc.ludd.ltu.se/
 PKG_SITES:=		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 
+PKG_ARCH_DEPENDS:=	!arm
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index a20d3dece..1fd798a74 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -15,6 +15,7 @@ PKG_URL:=		http://pcc.ludd.ltu.se/
 PKG_SITES:=		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 PKG_NOPARALLEL:=	1
 
+PKG_ARCH_DEPENDS:=	!arm
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include $(TOPDIR)/mk/package.mk