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 From a9de87c0a668bede3bc2744985a7d6ba903eb378 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Oct 2013 15:03:34 +0200 Subject: fix install of xml files into staging dir --- package/xcb-proto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 8a070c474..76e7a3864 100644 --- a/package/xcb-proto/Makefile +++ b/package/xcb-proto/Makefile @@ -25,14 +25,14 @@ include $(TOPDIR)/mk/python.mk CONFIGURE_ENV+= PYTHON=$(PYTHON) -xcb-proto-install: +post-build: ${INSTALL_DIR} ${STAGING_DIR}/usr/share/xcb - $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKBUILD}/src/*.xml ${STAGING_DIR}/usr/share/xcb - ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ - ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen xcb-python-install: + $(INSTALL_DIR) ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen + ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ + ${STAGING_DIR}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${INSTALL_DIR} ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen ${CP} ${WRKINST}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen/*.py \ ${IDIR_XCB_PYTHON}/usr/lib/python${PYTHON_VERSION}/site-packages/xcbgen -- cgit v1.2.3