From ea08c787c691ebdee41cf61731649cf906bfdc9c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 10:11:43 +0200 Subject: fix section variable --- package/xcb-proto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 8a070c474..c9db6f817 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -19,7 +19,7 @@ PKGSC_XCB_PYTHON:= x11/misc include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XCB_PROTO,xcb-proto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PROTO})) +$(eval $(call PKG_template,XCB_PYTHON,xcb-python,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_XCB_PYTHON})) include $(TOPDIR)/mk/python.mk -- cgit v1.2.3 From f0164ab61f840a2cc822bc8cf22d14654d904ba2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 13:32:29 +0200 Subject: disable TLS in gcc for m68k, needs to be checked for eglibc/glibc later --- toolchain/gcc/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ff8c3d509..b88bf6ccc 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -59,7 +59,9 @@ else GCC_CONFOPTS+= --disable-lto endif -ifeq ($(ARCH),cris) +ifeq ($(ARCH),m68k) +GCC_CONFOPTS+= --disable-tls +else if ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls -- cgit v1.2.3 From e6334e379eee65b8c543af4474557904b4965aba Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 13:32:51 +0200 Subject: fix package build --- package/e2fsprogs/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 3f4f75eaf..d7b44621a 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -73,6 +73,7 @@ endif e2fsprogs-install: # workaround for dev subpackage + mkdir -p ${IDIR_E2FSPROGS_DEV}/usr/bin ${CP} ${WRKINST}/usr/bin/compile_et \ ${IDIR_E2FSPROGS_DEV}/usr/bin -- cgit v1.2.3 From afeecde92280c6ee0f8e8cfe5d631db039ab5c45 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 14:41:28 +0200 Subject: hopefully get it right with teh if else construct --- toolchain/gcc/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index b88bf6ccc..634bea2f1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -61,11 +61,13 @@ endif ifeq ($(ARCH),m68k) GCC_CONFOPTS+= --disable-tls -else if ($(ARCH),cris) +else +if ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +endif ifeq ($(ARCH),powerpc) ifeq ($(ADK_TARGET_LIBC),musl) -- cgit v1.2.3 From 6433416b4ab7246ebb9fc63c72eb53a844fd6145 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 14:46:25 +0200 Subject: another try to get it right --- toolchain/gcc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 634bea2f1..775f871c1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -62,7 +62,7 @@ endif ifeq ($(ARCH),m68k) GCC_CONFOPTS+= --disable-tls else -if ($(ARCH),cris) +ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls -- cgit v1.2.3