< prev index next >

make/devkit/Tools.gmk

Print this page

        

@@ -49,13 +49,13 @@
   ARCH=armhfp
 endif
 
 $(info ARCH=$(ARCH))
 
-ifeq ($(BASE_OS), OL)
+ifeq ($(BASE_OS), OEL6)
   BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
-  LINUX_VERSION := OL6.4
+  LINUX_VERSION := OEL6.4
 else ifeq ($(BASE_OS), Fedora)
   DEFAULT_OS_VERSION := 27
   ifeq ($(BASE_OS_VERSION), )
     BASE_OS_VERSION := $(DEFAULT_OS_VERSION)
   endif

@@ -77,21 +77,12 @@
 
 ##########################################################################################
 # Define external dependencies
 
 # Latest that could be made to work.
-GCC_VER := 8.2.0
-ifeq ($(GCC_VER), 8.2.0)
-  gcc_ver := gcc-8.2.0
-  binutils_ver := binutils-2.30
-  ccache_ver := ccache-3.5.1a
-  CCACHE_DIRNAME := ccache-3.5.1
-  mpfr_ver := mpfr-3.1.5
-  gmp_ver := gmp-6.1.2
-  mpc_ver := mpc-1.0.3
-  gdb_ver := gdb-8.2.1
-else ifeq ($(GCC_VER), 7.3.0)
+GCC_VER := 7.3.0
+ifeq ($(GCC_VER), 7.3.0)
   gcc_ver := gcc-7.3.0
   binutils_ver := binutils-2.30
   ccache_ver := ccache-3.3.6
   mpfr_ver := mpfr-3.1.5
   gmp_ver := gmp-6.1.2

@@ -110,11 +101,11 @@
 endif
 
 GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
 BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.xz
 CCACHE := https://samba.org/ftp/ccache/$(ccache_ver).tar.xz
-MPFR := https://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
+MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
 GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
 MPC := http://ftp.gnu.org/pub/gnu/mpc/${mpc_ver}.tar.gz
 GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
 
 # RPMs used by all BASE_OS

@@ -181,20 +172,18 @@
 ##########################################################################################
 # Unpack source packages
 
 # Generate downloading + unpacking of sources.
 define Download
-  # Allow override
-  $(1)_DIRNAME ?= $(basename $(basename $(notdir $($(1)))))
-  $(1)_DIR = $(abspath $(SRCDIR)/$$($(1)_DIRNAME))
+  $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
   $(1)_CFG = $$($(1)_DIR)/configure
   $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
 
   $$($(1)_CFG) : $$($(1)_FILE)
         mkdir -p $$(SRCDIR)
         tar -C $$(SRCDIR) -xf $$<
-        $$(foreach p,$$(abspath $$(wildcard patches/$$(notdir $$($(1)_DIR)).patch)), \
+        $$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
           echo PATCHING $$(p) ; \
           patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
         )
         touch $$@
 

@@ -364,27 +353,25 @@
 # we build just the libs again for TARGET, then with whatever the arch
 # wants.
 $(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
 
 # Makefile creation. Simply run configure in build dir.
-# Setting CFLAGS to -O2 generates a much faster ld.
 $(bfdmakes) \
 $(BUILDDIR)/$(binutils_ver)/Makefile \
     : $(BINUTILS_CFG)
         $(info Configuring $@. Log in $(@D)/log.config)
         @mkdir -p $(@D)
         ( \
           cd $(@D) ; \
-          $(PATHPRE) $(ENVS) CFLAGS="-O2 $(CFLAGS)" \
+          $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
               $(BINUTILS_CFG) \
               $(CONFIG) \
               --with-sysroot=$(SYSROOT) \
               --disable-nls \
               --program-prefix=$(TARGET)- \
               --enable-multilib \
-              --enable-gold=default \
-              --enable-threads \
+              --enable-gold \
               --enable-plugins \
         ) > $(@D)/log.config 2>&1
         @echo 'done'
 
 $(BUILDDIR)/$(mpfr_ver)/Makefile \
< prev index next >