From 541abac9df677538b2e375600f02b39eec00cf37 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Jun 2010 22:17:22 +0200 Subject: fix cross-compile --- package/MesaLib/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 043034947..caaa9552c 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -48,7 +48,7 @@ CONFIGURE_ARGS+= --disable-static \ --with-dri-drivers=${DRI_DRIVERS} \ --with-demos=xdemos -XAKE_FLAGS+= APP_CC=${HOSTCC} HOST_CC=${HOSTCC} +XAKE_FLAGS+= HOST_CC=${HOSTCC} pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ @@ -57,7 +57,6 @@ pre-configure: --disable-glw \ --disable-gallium \ --with-driver=xlib \ - --with-demos=xdemos \ ); ${MAKE} -C ${WRKBUILD}/src/glsl ${MAKE} -C ${WRKBUILD}/src/glsl/apps -- cgit v1.2.3 From ebf1ffef54e96093d0ee20c8fe48f9818d300695 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Jun 2010 22:17:52 +0200 Subject: with devtmpfs, these devices nodes are obsolete --- scripts/install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 79bfa36bf..b436767a5 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -236,11 +236,6 @@ EOF umount $tmp/dev fi -printf "Creating device nodes\n" -mknod -m 666 $tmp/dev/null c 1 3 -mknod -m 622 $tmp/dev/console c 5 1 -mknod -m 666 $tmp/dev/tty c 5 0 - umount $tmp printf "Successfully installed.\n" -- cgit v1.2.3 From 81d9ade69615399ef810297ac195c6e638a89a04 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 26 Jun 2010 22:18:46 +0200 Subject: with gcc 4.5 we will need mpc --- toolchain/Makefile | 4 ++-- toolchain/mpc/Makefile | 32 ++++++++++++++++++++++++++++++++ toolchain/mpc/Makefile.inc | 9 +++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 toolchain/mpc/Makefile create mode 100644 toolchain/mpc/Makefile.inc diff --git a/toolchain/Makefile b/toolchain/Makefile index d2f59f8ba..0722894fd 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk -TARGETS:=binutils gmp mpfr gcc +TARGETS:=binutils gmp mpfr mpc gcc ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGETS+=glibc-ports glibc LIBC:=glibc @@ -37,7 +37,7 @@ install: $(TARGETS_INSTALL) clean: $(TARGETS_CLEAN) download: $(DOWNLOAD) -gcc-prepare: binutils-install gmp-install mpfr-install +gcc-prepare: binutils-install gmp-install mpfr-install mpc-install ifeq ($(ADK_TARGET_LIB_GLIBC),y) $(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare else diff --git a/toolchain/mpc/Makefile b/toolchain/mpc/Makefile new file mode 100644 index 000000000..d790e0912 --- /dev/null +++ b/toolchain/mpc/Makefile @@ -0,0 +1,32 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk +include Makefile.inc +include ../rules.mk +include ${TOPDIR}/mk/buildhlp.mk + +ifeq (${ADK_MAKE_PARALLEL},y) +MPC_MAKEOPTS+= -j${ADK_MAKE_JOBS} +endif + +$(WRKBUILD)/.headers: +$(WRKBUILD)/.configured: + (cd $(WRKBUILD); \ + $(WRKBUILD)/configure \ + --prefix=$(STAGING_TOOLS) \ + --with-gmp=$(STAGING_TOOLS) \ + --disable-shared \ + --enable-static \ + ); + touch $@ + +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured + $(MAKE) ${MPC_MAKEOPTS} -C $(WRKBUILD) all + touch $@ + +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled + $(MAKE) -C $(WRKBUILD) install + touch $@ + +include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/mpc/Makefile.inc b/toolchain/mpc/Makefile.inc new file mode 100644 index 000000000..970a2c848 --- /dev/null +++ b/toolchain/mpc/Makefile.inc @@ -0,0 +1,9 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +PKG_NAME:= mpc +PKG_VERSION:= 0.8.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= e98267ebd5648a39f881d66797122fb6 +PKG_SITES:= http://www.multiprecision.org/mpc/download/ +GMP_BUILD_DIR:= $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION) -- cgit v1.2.3