From 23eff1d5d3d4f22fc3d2fe9de026e3df3edf426d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 25 May 2010 17:48:45 +0200 Subject: fix MesaLib cross-compile --- package/MesaLib/Makefile | 19 +++++++++++++- package/MesaLib/patches/patch-src_glsl_Makefile | 11 ++++++++ .../patches/patch-src_glsl_Makefile_template | 11 -------- .../MesaLib/patches/patch-src_glsl_apps_Makefile | 15 ----------- package/firefox/Makefile | 1 + package/libXdamage/Makefile | 4 +-- package/libXfixes/Makefile | 4 +-- target/Config.in | 30 +++++++++++----------- 8 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 package/MesaLib/patches/patch-src_glsl_Makefile delete mode 100644 package/MesaLib/patches/patch-src_glsl_Makefile_template delete mode 100644 package/MesaLib/patches/patch-src_glsl_apps_Makefile diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 9d673613f..d5ce04b77 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= MESA library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm -PKG_BUILDDEP+= dri2proto glproto +PKG_BUILDDEP+= dri2proto glproto expat PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ @@ -25,10 +25,27 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D CONFIGURE_ARGS+= --disable-static \ --disable-gallium \ + --disable-glw \ + --with-driver=dri \ --without-demos XAKE_FLAGS+= APP_CC=${HOSTCC} HOST_CC=${HOSTCC} +pre-configure: + (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + ./configure \ + --disable-static \ + --disable-glw \ + --disable-gallium \ + --with-driver=xlib \ + --without-demos \ + ); + ${MAKE} -C ${WRKBUILD}/src/glsl + ${MAKE} -C ${WRKBUILD}/src/glsl/apps + cp ${WRKBUILD}/src/glsl/apps/compile \ + ${STAGING_TOOLS}/bin + ${MAKE} -C ${WRKBUILD}/src/glsl clean + post-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib $(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \ diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile new file mode 100644 index 000000000..baa023db4 --- /dev/null +++ b/package/MesaLib/patches/patch-src_glsl_Makefile @@ -0,0 +1,11 @@ +--- Mesa-7.8.1.orig/src/glsl/Makefile 2010-04-05 01:46:26.000000000 +0200 ++++ Mesa-7.8.1/src/glsl/Makefile 2010-05-21 17:17:54.621613561 +0200 +@@ -4,7 +4,7 @@ TOP = ../.. + + include $(TOP)/configs/current + +-SUBDIRS = pp cl apps ++SUBDIRS = pp cl + + default install clean: + @for dir in $(SUBDIRS) ; do \ diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template deleted file mode 100644 index bcb3256d6..000000000 --- a/package/MesaLib/patches/patch-src_glsl_Makefile_template +++ /dev/null @@ -1,11 +0,0 @@ ---- Mesa-7.8.1.orig/src/glsl/Makefile.template 2010-04-05 01:46:26.000000000 +0200 -+++ Mesa-7.8.1/src/glsl/Makefile.template 2010-04-19 21:18:45.000000000 +0200 -@@ -44,7 +44,7 @@ install: - ##### RULES ##### - - .c.o: -- $(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ -+ $(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@ - - -include depend - diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile deleted file mode 100644 index 175965dc5..000000000 --- a/package/MesaLib/patches/patch-src_glsl_apps_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- Mesa-7.8.1.orig/src/glsl/apps/Makefile 2010-04-05 01:46:26.000000000 +0200 -+++ Mesa-7.8.1/src/glsl/apps/Makefile 2010-04-19 21:20:55.000000000 +0200 -@@ -26,10 +26,10 @@ INCLUDES = -I. - .SUFFIXES: .c - - .c: -- $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ -+ $(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@ - - .c.o: -- $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@ -+ $(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@ - - - ##### TARGETS ##### diff --git a/package/firefox/Makefile b/package/firefox/Makefile index b8d667241..0009c48e2 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -11,6 +11,7 @@ PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11 PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib gtk+ libnotify libidl PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx +PKG_DEPENDS+= libxdamage libxfixes PKG_BUILDDEP+= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 libXt PKG_BUILDDEP+= nspr nss jpeg PKG_URL:= http://www.mozilla.org/ diff --git a/package/libXdamage/Makefile b/package/libXdamage/Makefile index 8e783c4fc..781481185 100644 --- a/package/libXdamage/Makefile +++ b/package/libXdamage/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= libXdamage PKG_VERSION:= 1.1.2 PKG_RELEASE:= 1 PKG_MD5SUM:= f8f19f747c8445213d5409ae8b8b2f0a -PKG_DESCR:= add short description +PKG_DESCR:= X Window System client interface to the DAMAGE extension to the X protocol PKG_SECTION:= libs PKG_BUILDDEP+= libXfixes damageproto PKG_URL:= add project url @@ -19,7 +19,7 @@ $(eval $(call PKG_template,LIBXDAMAGE,libxdamage,$(PKG_VERSION)-${PKG_RELEASE},$ post-install: $(INSTALL_DIR) $(IDIR_LIBXDAMAGE)/usr/lib - $(INSTALL_BIN) $(WRKINST)/usr/lib/libXdamage* \ + $(INSTALL_BIN) $(WRKINST)/usr/lib/libXdamage*.so* \ $(IDIR_LIBXDAMAGE)/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libXfixes/Makefile b/package/libXfixes/Makefile index d8f05f261..d6cc76bfb 100644 --- a/package/libXfixes/Makefile +++ b/package/libXfixes/Makefile @@ -7,10 +7,10 @@ PKG_NAME:= libXfixes PKG_VERSION:= 4.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 86eb4b916cd5948c0e20d279107b3331 -PKG_DESCR:= add short description +PKG_DESCR:= X Fixes Library PKG_SECTION:= libs PKG_BUILDDEP+= fixesproto -PKG_URL:= add project url +PKG_URL:= http://xorg.freedesktop.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/lib/ include $(TOPDIR)/mk/package.mk diff --git a/target/Config.in b/target/Config.in index 9206c527a..c5927e1a7 100644 --- a/target/Config.in +++ b/target/Config.in @@ -970,6 +970,14 @@ choice prompt "Compression method for initramfs and kernel" depends on ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK +config ADK_TARGET_INITRAMFS_COMPRESSION_LZMA + boolean + prompt "lzma" + select ADK_KERNEL_RD_LZMA + select ADK_KERNEL_KERNEL_LZMA + help + Select LZMA compression. + config ADK_TARGET_INITRAMFS_COMPRESSION_GZIP boolean prompt "gzip" @@ -986,14 +994,6 @@ config ADK_TARGET_INITRAMFS_COMPRESSION_BZIP2 help Select BZIP2 compression. -config ADK_TARGET_INITRAMFS_COMPRESSION_LZMA - boolean - prompt "lzma" - select ADK_KERNEL_RD_LZMA - select ADK_KERNEL_KERNEL_LZMA - help - Select LZMA compression. - config ADK_TARGET_INITRAMFS_COMPRESSION_LZO boolean prompt "lzo" @@ -1008,6 +1008,13 @@ choice prompt "Compression method for Kernel" depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK || ADK_TOOLCHAIN_ONLY) +config ADK_TARGET_KERNEL_COMPRESSION_LZMA + boolean + prompt "lzma" + select ADK_KERNEL_KERNEL_LZMA + help + Select LZMA compression for Kernel. + config ADK_TARGET_KERNEL_COMPRESSION_GZIP boolean prompt "gzip" @@ -1022,13 +1029,6 @@ config ADK_TARGET_KERNEL_COMPRESSION_BZIP2 help Select BZIP2 compression for Kernel. -config ADK_TARGET_KERNEL_COMPRESSION_LZMA - boolean - prompt "lzma" - select ADK_KERNEL_KERNEL_LZMA - help - Select LZMA compression for Kernel. - config ADK_TARGET_KERNEL_COMPRESSION_LZO boolean prompt "lzo" -- cgit v1.2.3