* [morty/master][PATCH 2/8] ti-gc320-tests: relax assignment of CC and other tools
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
2017-03-27 2:10 ` [morty/master][PATCH 3/8] gstreamer1.0-plugins-dsp66: correct use of CPP/CXX and other standard variables Denys Dmytriyenko
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Fix other warnings
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...nux.def-relax-assignment-of-CC-and-other-.patch | 38 ++++++++++++++++++++++
.../ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb | 7 ++--
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-makefile.linux.def-relax-assignment-of-CC-and-other-.patch
diff --git a/meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-makefile.linux.def-relax-assignment-of-CC-and-other-.patch b/meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-makefile.linux.def-relax-assignment-of-CC-and-other-.patch
new file mode 100644
index 0000000..0078a29
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/ti-gc320-tests/files/0001-makefile.linux.def-relax-assignment-of-CC-and-other-.patch
@@ -0,0 +1,38 @@
+From 764b18a591c0e64adb7d5e5147c6a9afef2111d3 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Sun, 26 Mar 2017 14:14:49 -0400
+Subject: [PATCH] makefile.linux.def: relax assignment of CC and other tools
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ tests/src/makefile.linux.def | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/src/makefile.linux.def b/tests/src/makefile.linux.def
+index 4904717..d229a5a 100755
+--- a/tests/src/makefile.linux.def
++++ b/tests/src/makefile.linux.def
+@@ -91,13 +91,13 @@ ifeq ($(USE_ARMCC),1)
+ LD := $(CROSS_COMPILE)link
+ else
+ CROSS_COMPILE ?= arm-none-linux-gnueabi-
+- CC := $(CROSS_COMPILE)gcc
+- CXX := $(CROSS_COMPILE)g++
+- AR := $(CROSS_COMPILE)ar
+- AS := $(CROSS_COMPILE)as
+- LD := $(CROSS_COMPILE)ld
+- RANLIB := $(CROSS_COMPILE)ranlib
+- STRIP := $(CROSS_COMPILE)strip
++ CC ?= $(CROSS_COMPILE)gcc
++ CXX ?= $(CROSS_COMPILE)g++
++ AR ?= $(CROSS_COMPILE)ar
++ AS ?= $(CROSS_COMPILE)as
++ LD ?= $(CROSS_COMPILE)ld
++ RANLIB ?= $(CROSS_COMPILE)ranlib
++ STRIP ?= $(CROSS_COMPILE)strip
+ endif
+
+ ################################################################
+--
+2.7.4
+
diff --git a/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb b/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb
index 4bbcb18..9138f27 100644
--- a/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb
+++ b/meta-arago-extras/recipes-graphics/ti-gc320-tests/ti-gc320-tests_5.0.11.p7.bb
@@ -7,7 +7,9 @@ DEPENDS = "ti-gc320-libs"
BRANCH = "ti-${PV}"
-SRC_URI = "git://git.ti.com/graphics/ti-gc320-test.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/graphics/ti-gc320-test.git;protocol=git;branch=${BRANCH} \
+file://0001-makefile.linux.def-relax-assignment-of-CC-and-other-.patch \
+"
SRCREV = "53207f8e360a3336276b62066a1d8a9e923de17e"
PR = "r2"
@@ -30,4 +32,5 @@ do_install() {
done
}
-INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP_${PN} += "ldflags already-stripped libdir"
+INSANE_SKIP_${PN}-dbg += "libdir"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [morty/master][PATCH 3/8] gstreamer1.0-plugins-dsp66: correct use of CPP/CXX and other standard variables
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
2017-03-27 2:10 ` [morty/master][PATCH 2/8] ti-gc320-tests: relax assignment of CC and other tools Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
2017-03-27 2:10 ` [morty/master][PATCH 4/8] libarch: calls doxygen and zip, depends on corresponding native packages Denys Dmytriyenko
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...rrect-use-of-CPP-CXX-and-other-standard-v.patch | 89 ++++++++++++++++++++++
.../gstreamer1.0-plugins-dsp66_git.bb | 4 +-
2 files changed, 92 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch
new file mode 100644
index 0000000..3c913ed
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66/0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch
@@ -0,0 +1,89 @@
+From 145964aa34bc2cbf1499de6e14de80a7c2d7e935 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Sun, 26 Mar 2017 15:12:44 -0400
+Subject: [PATCH] Makefile: correct use of CPP/CXX and other standard variables
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ src/kernels/make.inc | 16 +++++++---------
+ src/kernels/oclconv/Makefile | 7 +++----
+ 2 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/src/kernels/make.inc b/src/kernels/make.inc
+index 797e64b..f1475a3 100644
+--- a/src/kernels/make.inc
++++ b/src/kernels/make.inc
+@@ -4,7 +4,6 @@ DSP_INCLUDE += -I$(TARGET_ROOTDIR)/usr/share/ti/opencl
+ TI_IMGLIB_DIR=${TARGET_ROOTDIR}/usr/share/ti/ti-imglib-c66x-tree
+ TI_VLIB_DIR=${TARGET_ROOTDIR}/usr/share/ti/ti-vlib-c66x-tree
+
+-CPP = g++
+ CL6X = cl6x -mv6600 --abi=eabi $(DSP_INCLUDE)
+ CLOCL = clocl
+
+@@ -16,9 +15,9 @@ UNAME_M :=$(shell uname -m)
+ # If TI_OCL_INSTALL is set, setup make from that location
+ # ----------------------------------------------------------------------------
+ ifneq ($(TI_OCL_INSTALL),)
+- CPP = g++
+- CPP_FLAGS += -I$(TI_OCL_INSTALL)/usr/include
+- LD_FLAGS += -L$(TI_OCL_INSTALL)/usr/lib
++ CXX = g++
++ CXXFLAGS += -I$(TI_OCL_INSTALL)/usr/include
++ LDFLAGS += -L$(TI_OCL_INSTALL)/usr/lib
+ LIBS += -lbfd
+
+ # ----------------------------------------------------------------------------
+@@ -38,20 +37,19 @@ else ifneq (,$(findstring 86, $(UNAME_M)))
+
+ # gcc ARM cross compiler will not, by default, search the host's
+ # /usr/include. Explicitly specify here to find dependent vendor headers
+- cross: override CPP = arm-linux-gnueabihf-g++
+- cross: CPP_FLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include
++ cross: CXXFLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include
+
+ # If cross-compilineg, provide path to dependent ARM libraries on the
+ # target filesystem
+- cross: LD_FLAGS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib
++ cross: LDFLAGS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib
+ endif
+
+ %.o: %.cpp
+- @$(CPP) -c $(CPP_FLAGS) $<
++ @$(CXX) -c $(CXXFLAGS) $<
+ @echo Compiling $<
+
+ %.o: %.c
+- @$(CPP) -c $(CPP_FLAGS) $<
++ @$(CXX) -c $(CXXFLAGS) $<
+ @echo Compiling $<
+
+ %.obj: %.c
+diff --git a/src/kernels/oclconv/Makefile b/src/kernels/oclconv/Makefile
+index e271670..c3774f8 100644
+--- a/src/kernels/oclconv/Makefile
++++ b/src/kernels/oclconv/Makefile
+@@ -1,12 +1,12 @@
+ EXE = liboclconv.so
+-CPP_FLAGS = -O3 -shared -fPIC -L.
++CXXFLAGS = -O3 -shared -fPIC -L.
+ CLOCL_FLAGS =
+ include ../make.inc
+
+ all: ${EXE}
+
+-$(EXE): oclconv.o
+- @$(CPP) $(CPP_FLAGS) oclconv.o $(LD_FLAGS) $(LIBS) -o $@
++$(EXE): oclconv.o
++ @$(CXX) $(CXXFLAGS) oclconv.o $(LDFLAGS) $(LIBS) -o $@
+
+ oclconv.o: conv.dsp_h
+
+@@ -16,4 +16,3 @@ conv.dsp_h: conv.cl ${TI_IMGLIB_DIR}/lib/imglib.ae66 ${TI_VLIB_DIR}/packages/ti/
+
+ install:
+ mkdir -p ${DESTDIR}/usr/lib && install -m 755 ${EXE} ${DESTDIR}/usr/lib/.
+-
+--
+2.7.4
+
diff --git a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
index 6977a47..2adf47d 100644
--- a/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
+++ b/meta-arago-extras/recipes-multimedia/gst-plugins-ti/gstreamer1.0-plugins-dsp66_git.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "https://git.ti.com/processor-sdk/gst-plugin-dsp66"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=2827f94fc0a1adeff4d9702e97ce2979"
-SRC_URI = "git://git.ti.com/processor-sdk/gst-plugin-dsp66.git;protocol=git;branch=master"
+SRC_URI = "git://git.ti.com/processor-sdk/gst-plugin-dsp66.git;protocol=git;branch=master \
+file://0001-Makefile-correct-use-of-CPP-CXX-and-other-standard-v.patch \
+"
SRCREV = "0db24f44b49ad673bcebce5d25a63ea41551ebec"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [morty/master][PATCH 4/8] libarch: calls doxygen and zip, depends on corresponding native packages
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
2017-03-27 2:10 ` [morty/master][PATCH 2/8] ti-gc320-tests: relax assignment of CC and other tools Denys Dmytriyenko
2017-03-27 2:10 ` [morty/master][PATCH 3/8] gstreamer1.0-plugins-dsp66: correct use of CPP/CXX and other standard variables Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
2017-03-27 2:10 ` [morty/master][PATCH 5/8] linalg: fix toolchain variables, depend on doxygen and zip native pkgs Denys Dmytriyenko
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/meta-arago-extras/recipes-ti/libarch/libarch.inc b/meta-arago-extras/recipes-ti/libarch/libarch.inc
index 7d59276..e196fa0 100644
--- a/meta-arago-extras/recipes-ti/libarch/libarch.inc
+++ b/meta-arago-extras/recipes-ti/libarch/libarch.inc
@@ -17,7 +17,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
S = "${WORKDIR}/git"
-DEPENDS = "common-csl-ip-rtos ti-xdctools ti-sysbios ti-cgt6x-native ti-xdais ti-framework-components opencl opencl-monitor"
+DEPENDS = "common-csl-ip-rtos ti-xdctools ti-sysbios ti-cgt6x-native ti-xdais ti-framework-components opencl opencl-monitor doxygen-native zip-native"
export CGTROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
export TI_OCL_CGT_INSTALL = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [morty/master][PATCH 5/8] linalg: fix toolchain variables, depend on doxygen and zip native pkgs
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
` (2 preceding siblings ...)
2017-03-27 2:10 ` [morty/master][PATCH 4/8] libarch: calls doxygen and zip, depends on corresponding native packages Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
2017-03-27 2:10 ` [master][PATCH 6/8] weston: disable local patches - no longer apply to 2.x Denys Dmytriyenko
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../0001-Makefile-fix-toolchain-variables.patch | 192 +++++++++++++++++++++
| 31 ++--
2 files changed, 210 insertions(+), 13 deletions(-)
create mode 100644 meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch
diff --git a/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch b/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch
new file mode 100644
index 0000000..af7c6a2
--- /dev/null
+++ b/meta-arago-extras/recipes-ti/linalg/files/0001-Makefile-fix-toolchain-variables.patch
@@ -0,0 +1,192 @@
+From a99f267c7dd799cd66f64fa41a3bd7b5c5d6f8a1 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Sun, 26 Mar 2017 18:17:06 -0400
+Subject: [PATCH] Makefile: fix toolchain variables
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ examples/arm+dsp/make.inc | 1 -
+ src/ti/linalg/blis/config/cortex-a15/make_defs.mk | 1 -
+ src/ti/linalg/cblas/Makefile.ARM | 4 +---
+ src/ti/linalg/clapack/make.inc.ARM | 8 +++-----
+ src/ti/linalg/clapack/make.inc.ARMBLAS | 10 ++++------
+ src/ti/linalg/clapack/make.inc.ARMOpenCL | 8 +++-----
+ src/ti/linalg/make.inc | 6 +-----
+ src/ti/linalg/tuning/make.inc | 1 -
+ 8 files changed, 12 insertions(+), 27 deletions(-)
+
+diff --git a/examples/arm+dsp/make.inc b/examples/arm+dsp/make.inc
+index c3a042d..e916b97 100644
+--- a/examples/arm+dsp/make.inc
++++ b/examples/arm+dsp/make.inc
+@@ -11,7 +11,6 @@ ifneq (,$(findstring 86, $(UNAME_M)))
+
+ # gcc ARM cross compiler will not, by default, search the host's
+ # /usr/include. Explicitly specify here to find dependent vendor headers
+- CC = arm-linux-gnueabihf-gcc
+ else
+ CC = gcc
+ endif
+diff --git a/src/ti/linalg/blis/config/cortex-a15/make_defs.mk b/src/ti/linalg/blis/config/cortex-a15/make_defs.mk
+index 58130a0..13e10be 100644
+--- a/src/ti/linalg/blis/config/cortex-a15/make_defs.mk
++++ b/src/ti/linalg/blis/config/cortex-a15/make_defs.mk
+@@ -74,7 +74,6 @@ GIT_LOG := $(GIT) log --decorate
+ #
+
+ # --- Determine the C compiler and related flags ---
+-CC := arm-linux-gnueabihf-gcc
+ #CC := gcc
+ # Enable IEEE Standard 1003.1-2004 (POSIX.1d).
+ # NOTE: This is needed to enable posix_memalign().
+diff --git a/src/ti/linalg/cblas/Makefile.ARM b/src/ti/linalg/cblas/Makefile.ARM
+index 3702887..e065831 100644
+--- a/src/ti/linalg/cblas/Makefile.ARM
++++ b/src/ti/linalg/cblas/Makefile.ARM
+@@ -32,8 +32,6 @@ LN_S = ln -sf
+ # Compilers
+ #-----------------------------------------------------------------------------
+
+-CC = arm-linux-gnueabihf-gcc
+-FC = arm-linux-gnueabihf-gfortran
+ LOADER = $(FC)
+
+ #-----------------------------------------------------------------------------
+@@ -47,6 +45,6 @@ FFLAGS = -O2
+ # Archive programs and flags
+ #-----------------------------------------------------------------------------
+
+-ARCH = arm-linux-gnueabihf-ar
++ARCH = $(AR)
+ ARCHFLAGS = r
+ RANLIB = echo
+diff --git a/src/ti/linalg/clapack/make.inc.ARM b/src/ti/linalg/clapack/make.inc.ARM
+index 0fdbe72..204904b 100644
+--- a/src/ti/linalg/clapack/make.inc.ARM
++++ b/src/ti/linalg/clapack/make.inc.ARM
+@@ -23,10 +23,9 @@ PLAT = _ARM
+ # This is used to compile C libary
+ #CC = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP
+ # if no wrapping of the blas library is needed, uncomment next line
+-CC = arm-linux-gnueabihf-gcc
+ CFLAGS = -O2 -I$(TOPDIR)/INCLUDE
+-LINKER = arm-linux-gnueabihf-ld
+-LOADER = arm-linux-gnueabihf-gcc
++LINKER = $(LD)
++LOADER = $(CC)
+ LOADOPTS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib
+ NOOPT = -O0 -I$(TOPDIR)/INCLUDE
+ DRVCFLAGS = $(CFLAGS)
+@@ -51,9 +50,8 @@ TIMER = INT_CPU_TIME
+ # The archiver and the flag(s) to use when building archive (library)
+ # If you system has no ranlib, set RANLIB = echo.
+ #
+-ARCH = arm-linux-gnueabihf-ar
++ARCH = $(AR)
+ ARCHFLAGS= cr
+-RANLIB = arm-linux-gnueabihf-ranlib
+ #
+ # The location of BLAS library for linking the testing programs.
+ # The target's machine-specific, optimized BLAS library should be
+diff --git a/src/ti/linalg/clapack/make.inc.ARMBLAS b/src/ti/linalg/clapack/make.inc.ARMBLAS
+index e3b1b04..d95763c 100644
+--- a/src/ti/linalg/clapack/make.inc.ARMBLAS
++++ b/src/ti/linalg/clapack/make.inc.ARMBLAS
+@@ -23,10 +23,9 @@ PLAT = _ARMBLAS
+ # This is used to compile C libary
+ #CC = arm-linux-gnueabihf-gcc
+ # if no wrapping of the blas library is needed, uncomment next line
+-CC = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP
+-CFLAGS = -O3 -I$(TOPDIR)/INCLUDE
+-LINKER = arm-linux-gnueabihf-ld
+-LOADER = arm-linux-gnueabihf-gcc
++CFLAGS = -O3 -I$(TOPDIR)/INCLUDE -DNO_BLAS_WRAP
++LINKER = $(LD)
++LOADER = $(CC)
+ LOADOPTS =
+ NOOPT = -O0 -I$(TOPDIR)/INCLUDE
+ DRVCFLAGS = $(CFLAGS)
+@@ -51,9 +50,8 @@ TIMER = INT_CPU_TIME
+ # The archiver and the flag(s) to use when building archive (library)
+ # If you system has no ranlib, set RANLIB = echo.
+ #
+-ARCH = arm-linux-gnueabihf-ar
++ARCH = $(AR)
+ ARCHFLAGS= cr
+-RANLIB = arm-linux-gnueabihf-ranlib
+ #
+ # The location of BLAS library for linking the testing programs.
+ # The target's machine-specific, optimized BLAS library should be
+diff --git a/src/ti/linalg/clapack/make.inc.ARMOpenCL b/src/ti/linalg/clapack/make.inc.ARMOpenCL
+index 036b3d1..1acc421 100644
+--- a/src/ti/linalg/clapack/make.inc.ARMOpenCL
++++ b/src/ti/linalg/clapack/make.inc.ARMOpenCL
+@@ -21,12 +21,11 @@ PLAT = _ARM
+ #
+ #######################################################
+ # This is used to compile C libary
+-CC = arm-linux-gnueabihf-gcc #-pg
+ # if no wrapping of the blas library is needed, uncomment next line
+ #CC = arm-linux-gnueabihf-gcc -DNO_BLAS_WRAP
+ CFLAGS = -O2 -I$(TOPDIR)/INCLUDE #-g
+-LINKER = arm-linux-gnueabihf-ld
+-LOADER = arm-linux-gnueabihf-gcc
++LINKER = $(LD)
++LOADER = $(CC)
+ LOADOPTS = -L$(TARGET_ROOTDIR)/lib -L$(TARGET_ROOTDIR)/usr/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/lib -Wl,-rpath-link,$(TARGET_ROOTDIR)/usr/lib
+ NOOPT = -O0 -I$(TOPDIR)/INCLUDE
+ DRVCFLAGS = $(CFLAGS)
+@@ -51,9 +50,8 @@ TIMER = INT_CPU_TIME
+ # The archiver and the flag(s) to use when building archive (library)
+ # If you system has no ranlib, set RANLIB = echo.
+ #
+-ARCH = arm-linux-gnueabihf-ar
++ARCH = $(AR)
+ ARCHFLAGS= cr
+-RANLIB = arm-linux-gnueabihf-ranlib
+ #
+ # The location of BLAS library for linking the testing programs.
+ # The target's machine-specific, optimized BLAS library should be
+diff --git a/src/ti/linalg/make.inc b/src/ti/linalg/make.inc
+index b2e1afe..8588019 100644
+--- a/src/ti/linalg/make.inc
++++ b/src/ti/linalg/make.inc
+@@ -1,5 +1,4 @@
+-
+-CPP = g++
++CPP = $(CXX)
+ CL6X = cl6x -mv6600 --abi=eabi $(DSP_INCLUDE)
+ CLOCL = clocl
+
+@@ -7,8 +6,6 @@ LIBS = -lOpenCL -locl_util #-lstdc++ -lrt
+
+ UNAME_M :=$(shell uname -m)
+
+-OBJCOPY = arm-linux-gnueabihf-objcopy
+-
+ ifneq (,$(findstring 86, $(UNAME_M)))
+ .DEFAULT_GOAL := cross
+
+@@ -29,7 +26,6 @@ ifneq (,$(findstring 86, $(UNAME_M)))
+
+ # gcc ARM cross compiler will not, by default, search the host's
+ # /usr/include. Explicitly specify here to find dependent vendor headers
+- cross: override CPP = arm-linux-gnueabihf-g++
+ cross: CPP_FLAGS += -I$(TARGET_ROOTDIR)/usr/include -idirafter /usr/include
+ #cross: CL6X_FLAGS += -I$(OMP_DIR)/packages/ti/runtime/openmp
+
+diff --git a/src/ti/linalg/tuning/make.inc b/src/ti/linalg/tuning/make.inc
+index cd3c653..ecce3d9 100644
+--- a/src/ti/linalg/tuning/make.inc
++++ b/src/ti/linalg/tuning/make.inc
+@@ -11,7 +11,6 @@ ifneq (,$(findstring 86, $(UNAME_M)))
+
+ # gcc ARM cross compiler will not, by default, search the host's
+ # /usr/include. Explicitly specify here to find dependent vendor headers
+- CC = arm-linux-gnueabihf-gcc
+ else
+ CC = gcc
+ endif
+--
+2.7.4
+
--git a/meta-arago-extras/recipes-ti/linalg/linalg.inc b/meta-arago-extras/recipes-ti/linalg/linalg.inc
index 924b299..8879592 100644
--- a/meta-arago-extras/recipes-ti/linalg/linalg.inc
+++ b/meta-arago-extras/recipes-ti/linalg/linalg.inc
@@ -10,22 +10,27 @@ require recipes-ti/includes/arago-paths.inc
require recipes-ti/includes/ti-staging.inc
BRANCH = "master"
-SRC_URI = "git://git.ti.com/dense-linear-algebra-libraries/linalg.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://git.ti.com/dense-linear-algebra-libraries/linalg.git;protocol=git;branch=${BRANCH} \
+file://0001-Makefile-fix-toolchain-variables.patch \
+"
LIC_FILES_CHKSUM = "file://src/ti/linalg/docs/LINALG_1.2.0_manifest.html;md5=f30895e41e5947c3439b1ad4cf4c8555"
SRCREV = "01960b319783b29aacf12b2a72606b28d657b78e"
-DEPENDS = "common-csl-ip \
- libarch \
- ti-xdctools \
- ti-ipc-rtos \
- ti-sysbios \
- ti-cgt6x-native \
- ti-xdais \
- ti-framework-components \
- libulm \
- openmp-rtos \
- opencl \
- clocl-native \
+DEPENDS = " \
+common-csl-ip \
+libarch \
+ti-xdctools \
+ti-ipc-rtos \
+ti-sysbios \
+ti-cgt6x-native \
+ti-xdais \
+ti-framework-components \
+libulm \
+openmp-rtos \
+opencl \
+clocl-native \
+doxygen-native \
+zip-native \
"
export TI_OCL_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/opencl"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [master][PATCH 6/8] weston: disable local patches - no longer apply to 2.x
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
` (3 preceding siblings ...)
2017-03-27 2:10 ` [morty/master][PATCH 5/8] linalg: fix toolchain variables, depend on doxygen and zip native pkgs Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
2017-03-27 2:10 ` [master][PATCH 7/8] layer.conf: add groff to HOSTTOOLS Denys Dmytriyenko
2017-03-27 2:10 ` [master][PATCH 8/8] branding-core: disable mmip feature due to gstreamer breakage Denys Dmytriyenko
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-graphics/wayland/weston_2.0.0.bbappend | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
index f8329c8..4a6c580 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_2.0.0.bbappend
@@ -10,10 +10,11 @@ RDEPENDS_${PN} += "weston-conf"
SRC_URI += " \
- file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch \
- file://0002-Weston-Allow-visual_id-to-be-0.patch \
- file://0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
- file://0004-Weston-Fix-touch-screen-crash-issue.patch \
- file://0001-compositor-drm-fix-hotplug-weston-termination-proble.patch \
- file://0001-compositor-drm-support-RGB565-with-pixman-renderer.patch \
"
+
+# file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch
+# file://0002-Weston-Allow-visual_id-to-be-0.patch
+# file://0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch
+# file://0004-Weston-Fix-touch-screen-crash-issue.patch
+# file://0001-compositor-drm-fix-hotplug-weston-termination-proble.patch
+# file://0001-compositor-drm-support-RGB565-with-pixman-renderer.patch
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [master][PATCH 7/8] layer.conf: add groff to HOSTTOOLS
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
` (4 preceding siblings ...)
2017-03-27 2:10 ` [master][PATCH 6/8] weston: disable local patches - no longer apply to 2.x Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
2017-03-27 2:10 ` [master][PATCH 8/8] branding-core: disable mmip feature due to gstreamer breakage Denys Dmytriyenko
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 3 +++
1 file changed, 3 insertions(+)
--git a/meta-arago-extras/conf/layer.conf b/meta-arago-extras/conf/layer.conf
index 83ac107..3ce0eac 100644
--- a/meta-arago-extras/conf/layer.conf
+++ b/meta-arago-extras/conf/layer.conf
@@ -40,3 +40,6 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
gstreamer1.0-plugins-bad \
opencl \
"
+
+# ti-llvm3.6 calls groff
+HOSTTOOLS += "groff"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [master][PATCH 8/8] branding-core: disable mmip feature due to gstreamer breakage
2017-03-27 2:10 [morty/master][PATCH 1/8] glsdk-example-apps: fix library linking issues Denys Dmytriyenko
` (5 preceding siblings ...)
2017-03-27 2:10 ` [master][PATCH 7/8] layer.conf: add groff to HOSTTOOLS Denys Dmytriyenko
@ 2017-03-27 2:10 ` Denys Dmytriyenko
6 siblings, 0 replies; 8+ messages in thread
From: Denys Dmytriyenko @ 2017-03-27 2:10 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/branding-core.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta-arago-distro/conf/distro/include/branding-core.inc b/meta-arago-distro/conf/distro/include/branding-core.inc
index a506e3c..b53e7ef 100644
--- a/meta-arago-distro/conf/distro/include/branding-core.inc
+++ b/meta-arago-distro/conf/distro/include/branding-core.inc
@@ -10,3 +10,7 @@ ALTERNATIVE_PRIORITY_pn-opencl-monitor = "1"
# Raise priority for sample IPC FW images
ALTERNATIVE_PRIORITY_pn-ti-ipc-rtos = "15"
+
+# Temporarily disable "mmip" machine feature for all SOCs while building
+# latest code base, until it is fixed for gstreamer > 1.10
+MACHINE_FEATURES := "${@d.getVar('MACHINE_FEATURES', True).replace('mmip', '')}"
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread