diff options
36 files changed, 128 insertions, 118 deletions
@@ -97,7 +97,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.11.10" + prompt "3.12.6" boolean depends on ADK_TOOLCHAIN_ONLY diff --git a/mk/build.mk b/mk/build.mk index 77b70a3f8..07fcbc793 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -544,7 +544,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ ( \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ae4a99069..34c639a62 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,8 +1,8 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.11.10 +KERNEL_VERSION:= 3.12.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 +KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e endif ifeq ($(ADK_KERNEL_VERSION_3_12_6),y) KERNEL_VERSION:= 3.12.6 diff --git a/mk/vars.mk b/mk/vars.mk index 014017ee8..bc6689cb8 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -82,7 +82,7 @@ TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(T endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ - -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ + -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ $(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH) # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf diff --git a/package/boost/Makefile b/package/boost/Makefile index d5f4325fc..327f72c22 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost PKG_VERSION:= 1.55.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17 PKG_DESCR:= boost C++ library PKG_SECTION:= libs +PKG_BUILDDEP:= autotool bzip2-host python2-host PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} PKG_OPTS:= dev @@ -18,12 +19,12 @@ PKG_ARCH_DEPENDS:= !m68k DISTFILES:= boost_1_55_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_1_55_0 -PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave +PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options PYTHON regex serialization signals system test thread wave PKGFD_date_time:= with date-time -PKGFD_python:= with Python -PKGFB_python:= python2 -PKGFS_python:= python2 +PKGFD_PYTHON:= with Python +PKGFB_PYTHON:= python2 +PKGFS_PYTHON:= python2 PKGFD_iostreams:= with iostreams PKGFD_graph:= with graph PKGFD_graph_parallel:= with graph_parallel @@ -107,7 +108,7 @@ endif GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++ GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`" -PYTHON_PATH:= ${STAGING_TARGET_DIR}/usr/bin/python +PYTHON_PATH:= ${STAGING_HOST_DIR}/usr/bin/python PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`" PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" USER_JAM:= ${WRKBUILD}/tools/build/v2/user-config.jam @@ -141,6 +142,7 @@ endif --layout=versioned \ --disable-long-double \ --without-mpi \ + --debug-configuration \ ${CONFIGURE_ARGS} \ install \ ) diff --git a/package/bzr/Makefile b/package/bzr/Makefile index 2875092ab..f1166b02c 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -4,15 +4,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bzr -PKG_VERSION:= 2.5.1 +PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= ac5079858364a046071000d5cdccb67b +PKG_MD5SUM:= 28c86653d0df10d202c6b842deb0ea35 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_BUILDDEP:= python2 PKG_DEPENDS:= python2 PKG_URL:= http://bazaar.canonical.com/en/ -PKG_SITES:= https://launchpad.net/bzr/2.5/2.5.1/+download/ +PKG_SITES:= https://launchpad.net/bzr/2.6/2.6.0/+download/ + +PKG_HOST_DEPENDS:= !darwin include $(TOPDIR)/mk/package.mk diff --git a/package/cups/Makefile b/package/cups/Makefile index f67813494..5c39f054c 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.7.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7 PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc @@ -48,7 +48,7 @@ HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --with-components=core \ --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ - OPTIM='-fPIC -std=c89' + OPTIM='-fPIC -std=c89' LSB_BUILD=y CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure new file mode 100644 index 000000000..47c84cd38 --- /dev/null +++ b/package/monit/patches/patch-configure @@ -0,0 +1,11 @@ +--- monit-5.6.orig/configure 2013-09-03 14:55:49.000000000 +0200 ++++ monit-5.6/configure 2014-02-10 18:05:03.000000000 +0100 +@@ -13575,7 +13575,7 @@ fi + # ------------------------------------------------------------------------ + + # Backward compatibility until we get ride of arch settings +-architecture=`uname` ++architecture=Linux + if test "$architecture" = "SunOS" + then + ARCH="SOLARIS" diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile index 3d08b64cf..390df7cf1 100644 --- a/package/mozjs/Makefile +++ b/package/mozjs/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= bzip2-host python2-host nspr PKG_SITES:= http://ftp.mozilla.org/pub/mozilla.org/js/ PKG_OPTS:= dev +PKG_HOST_DEPENDS:= !darwin + DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION} WRKSRC= ${WRKDIST}/js/src diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 6a756a4a9..09035c248 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -27,6 +27,7 @@ endif TARGET_CPPFLAGS+= -DNOLUA TARGET_LDFLAGS+= -lpthread +CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ diff --git a/package/nmap/patches/patch-liblinear_Makefile b/package/nmap/patches/patch-liblinear_Makefile new file mode 100644 index 000000000..fdb24470d --- /dev/null +++ b/package/nmap/patches/patch-liblinear_Makefile @@ -0,0 +1,16 @@ +--- nmap-6.40.orig/liblinear/Makefile 2011-09-23 23:15:09.000000000 +0200 ++++ nmap-6.40/liblinear/Makefile 2014-02-11 19:38:23.000000000 +0100 +@@ -1,10 +1,10 @@ + CXX ?= g++ + CC ?= gcc +-CFLAGS = -Wall -Wconversion -O3 -fPIC ++CFLAGS ?= -Wall -Wconversion -O3 -fPIC + LIBS = blas/blas.a + SHVER = 1 +-AR = ar +-RANLIB = ranlib ++AR ?= ar ++RANLIB ?= ranlib + #LIBS = -lblas + + all: train predict diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 9222a54ff..e3a5e4ac0 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 06e5f93dbf13f2c19647ca15ffc23ac1 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security +PKG_BUILDDEP:= autotool PKG_DEPENDS:= kmod-tun ip PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ @@ -35,6 +36,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),) CONFIGURE_ARGS+= --enable-lzo else diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac new file mode 100644 index 000000000..c0a43dae4 --- /dev/null +++ b/package/openvpn/patches/patch-configure_ac @@ -0,0 +1,31 @@ +--- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 ++++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 +@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET + + AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) + AC_ARG_VAR([ROUTE], [full path to route utility]) +-AC_ARG_VAR([IPROUTE], [full path to ip utility]) + AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests + AC_ARG_VAR([MAN2HTML], [path to man2html utility]) + AC_ARG_VAR([GIT], [path to git utility]) +-AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) + AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests + AC_CHECK_PROGS([MAN2HTML], [man2html]) + AC_CHECK_PROGS([GIT], [git]) # optional +-AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) +-AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) +-AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) ++AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) + + # + # Libtool +@@ -982,7 +976,6 @@ else + fi + + if test "${enable_iproute2}" = "yes"; then +- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) + AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) + else + if test "${WIN32}" != "yes"; then diff --git a/package/polkit/Makefile b/package/polkit/Makefile index 5ed8333e3..5be0cd1df 100644 --- a/package/polkit/Makefile +++ b/package/polkit/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.freedesktop.org/wiki/Software/polkit/ PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_HOST_DEPENDS:= !darwin + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/systemd/Makefile b/package/systemd/Makefile deleted file mode 100644 index 5fe43a086..000000000 --- a/package/systemd/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# 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 - -PKG_NAME:= systemd -PKG_VERSION:= 208 -PKG_RELEASE:= 4 -PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165 -PKG_DESCR:= System and Service Manager -PKG_SECTION:= utils -PKG_DEPENDS:= libblkid libcap -PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap -PKG_BUILDDEP+= libgcrypt gperf-host -PKG_URL:= http://freedesktop.org/wiki/Software/systemd/ -PKG_SITES:= http://www.freedesktop.org/software/systemd/ - -PKG_LIBC_DEPENDS:= eglibc glibc -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -AUTOTOOL_STYLE:= autoreconf -TARGET_LDFLAGS+= -lrt -CONFIGURE_ARGS+= --disable-static \ - --without-python \ - --enable-gudev \ - --disable-manpages \ - --disable-polkit - -# TODO -systemd-install: - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/systemd/files/udev.conffiles b/package/systemd/files/udev.conffiles deleted file mode 100644 index 50a5fb889..000000000 --- a/package/systemd/files/udev.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/udev/udev.conf diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am deleted file mode 100644 index c35e6d461..000000000 --- a/package/systemd/patches/patch-Makefile_am +++ /dev/null @@ -1,20 +0,0 @@ ---- systemd-208.orig/Makefile.am 2013-10-02 04:57:09.000000000 +0200 -+++ systemd-208/Makefile.am 2013-12-14 16:18:32.000000000 +0100 -@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - AM_MAKEFLAGS = --no-print-directory - AUTOMAKE_OPTIONS = color-tests parallel-tests - --SUBDIRS = . po -+SUBDIRS = . - - # remove targets if the command fails - .DELETE_ON_ERROR: -@@ -537,8 +537,6 @@ dist_doc_DATA = \ - LICENSE.MIT \ - DISTRO_PORTING - --@INTLTOOL_POLICY_RULE@ -- - # ------------------------------------------------------------------------------ - - MANPAGES = diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac deleted file mode 100644 index e3aeaa5c0..000000000 --- a/package/systemd/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ ---- systemd-208.orig/configure.ac 2013-10-02 01:54:26.000000000 +0200 -+++ systemd-208/configure.ac 2013-12-13 16:37:55.000000000 +0100 -@@ -47,9 +47,6 @@ LT_INIT([disable-static]) - AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])]) - AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])]) - --# i18n stuff for the PolicyKit policy files --IT_PROG_INTLTOOL([0.40.0]) -- - GETTEXT_PACKAGE=systemd - AC_SUBST(GETTEXT_PACKAGE) - diff --git a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in b/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in deleted file mode 100644 index 1758a8957..000000000 --- a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in +++ /dev/null @@ -1,13 +0,0 @@ ---- systemd-208.orig/src/gudev/gudev-1.0.pc.in 2013-08-13 22:02:46.000000000 +0200 -+++ systemd-208/src/gudev/gudev-1.0.pc.in 2014-01-10 16:50:37.000000000 +0100 -@@ -1,7 +1,7 @@ - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=@prefix@ -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: gudev-1.0 - Description: GObject bindings for libudev diff --git a/package/systemd/patches/patch-src_libudev_libudev_pc_in b/package/systemd/patches/patch-src_libudev_libudev_pc_in deleted file mode 100644 index 7bc3ab6f3..000000000 --- a/package/systemd/patches/patch-src_libudev_libudev_pc_in +++ /dev/null @@ -1,15 +0,0 @@ ---- systemd-208.orig/src/libudev/libudev.pc.in 2013-08-13 22:02:46.000000000 +0200 -+++ systemd-208/src/libudev/libudev.pc.in 2013-12-14 17:20:31.000000000 +0100 -@@ -6,9 +6,9 @@ - # (at your option) any later version. - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix}/usr -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: libudev - Description: Library to access udev device information diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 79d416569..1ff957c25 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_XBMC ]]; then + NEED_JAVA="$NEED_JAVA xbmc" +fi + if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi @@ -78,7 +82,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then fi if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then - NEED_WWW="$NEED_WWW libXfont" NEED_XMLTO="$NEED_XMLTO libXfont" fi @@ -258,6 +261,13 @@ if [[ -n $NEED_DBUSGLIB ]]; then fi fi +if [[ -n $NEED_JAVA ]]; then + if ! which java >/dev/null 2>&1; then + echo >&2 You need java to build $NEED_JAVA + out=1 + fi +fi + if [[ -n $ADK_USE_CCACHE ]]; then if ! which ccache >/dev/null 2>&1; then echo >&2 You have selected to build with ccache, but ccache could not be found. diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index ade935950..956acab7a 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_NO_FPU + select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (little endian). diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb index 8a99ca78a..4756e0db2 100644 --- a/target/arm/sys-available/toolchain-armeb +++ b/target/arm/sys-available/toolchain-armeb @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_NO_FPU + select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (big endian). diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k index 4cfe403a7..0bc27683b 100644 --- a/target/m68k/sys-available/toolchain-m68k +++ b/target/m68k/sys-available/toolchain-m68k @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K select ADK_m68k select ADK_toolchain_m68k select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a m68k toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 3e1c34436..6fb76c5f5 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/target/microblaze/sys-available/toolchain-microblaze @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE select ADK_big select ADK_toolchain_microblaze select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Microblaze toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblazeel b/target/microblaze/sys-available/toolchain-microblazeel index eb66d103f..8992e5550 100644 --- a/target/microblaze/sys-available/toolchain-microblazeel +++ b/target/microblaze/sys-available/toolchain-microblazeel @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL select ADK_little select ADK_toolchain_microblazeel select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Microblaze toolchain. diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 783d71fa0..9e93cfdcd 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS select ADK_big select ADK_toolchain_mips select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help MIPS toolchain. diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel index 7eb9a743f..4c197b808 100644 --- a/target/mips/sys-available/toolchain-mipsel +++ b/target/mips/sys-available/toolchain-mipsel @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL select ADK_little select ADK_toolchain_mipsel select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help MIPS toolchain. diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index 0faea45e5..340834f16 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/target/ppc/sys-available/toolchain-ppc @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC select ADK_ppc select ADK_toolchain_ppc select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a ppc toolchain. diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index 3574e863c..5a38c89f0 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 select ADK_ppc64 select ADK_toolchain_ppc64 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a ppc64 toolchain. diff --git a/target/sh/sys-available/toolchain-sh b/target/sh/sys-available/toolchain-sh index 33fdfa446..8fb17a472 100644 --- a/target/sh/sys-available/toolchain-sh +++ b/target/sh/sys-available/toolchain-sh @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH select ADK_toolchain_sh select ADK_CPU_SH4 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a superh toolchain (sh4). diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc index 5d1a6c044..e668592e2 100644 --- a/target/sparc/sys-available/toolchain-sparc +++ b/target/sparc/sys-available/toolchain-sparc @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC select ADK_toolchain_sparc select ADK_CPU_SPARC_V8 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a sparc toolchain. diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64 index 060cc62dd..15eaca575 100644 --- a/target/sparc64/sys-available/toolchain-sparc64 +++ b/target/sparc64/sys-available/toolchain-sparc64 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64 select ADK_toolchain_sparc64 select ADK_CPU_SPARC_V9 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a sparc64 toolchain. diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 index e4c02a0e5..bec515fca 100644 --- a/target/x86/sys-available/toolchain-i686 +++ b/target/x86/sys-available/toolchain-i686 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 select ADK_toolchain_x86 select ADK_CPU_I686 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a x86 toolchain (i686 optimized). diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index 0c175da69..fd1025270 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 select ADK_x86_64 select ADK_toolchain_x86_64 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a x86_64 toolchain. diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 26f1dc96a..c547591a0 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -26,6 +26,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \ --disable-cloog-version-check \ --without-ppl \ --without-cloog \ + --without-isl \ --disable-nls ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y) @@ -61,13 +62,21 @@ GCC_CONFOPTS+= --disable-lto endif ifeq ($(ARCH),m68k) +ifeq ($(ADK_TARGET_LIBC),uclibc) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +else +GCC_CONFOPTS+= --enable-tls +endif ifeq ($(ARCH),powerpc) +ifeq ($(ADK_TARGET_LIBC),uclibc) +GCC_CONFOPTS+= --disable-target-optspace --with-long-double-128 --enable-secureplt +else GCC_CONFOPTS+= --disable-target-optspace --with-long-double-64 --enable-secureplt +endif else GCC_CONFOPTS+= --enable-target-optspace endif @@ -107,7 +116,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) # these symlinks are very important, do not remove rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib ifeq ($(ADK_LINUX_SH),y) @@ -177,10 +186,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled done; # remove duplicate tools, convert hardlinks to symlinks set -e; \ - cd $(STAGING_HOST_DIR)/bin; \ - for app in ar as c++ g++ gcc gcc-${PKG_VERSION} ld ld.bfd nm objcopy objdump ranlib strip; do \ - ln -sf ../$(REAL_GNU_TARGET_NAME)/bin/$${app} $(REAL_GNU_TARGET_NAME)-$${app}; \ + cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin; \ + for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \ + ln -sf ../../bin/$(REAL_GNU_TARGET_NAME)-$${app} $${app}; \ done; + (cd $(STAGING_HOST_DIR)/bin && \ + ln -sf $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-gcc-${PKG_VERSION}) # setup symlink, so that gcc/g++ find cc1plus (cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/ && \ ln -sf ../libexec .) @@ -194,6 +205,8 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled @-test -d $(STAGING_TARGET_DIR)/lib64 && \ cd $(STAGING_TARGET_DIR)/lib64 && \ ln -sf libstdc++.so.6.0.17 libstdc++.so + # cleanup unneeded docs + rm -rf $(STAGING_HOST_DIR)/share touch $@ include ${TOPDIR}/mk/toolchain.mk |