diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-23 15:04:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-23 15:04:05 +0200 |
| commit | f771c23af1b3ca79359e6422308a0d402ffdef92 (patch) | |
| tree | 89050b12a2bd6e6c1389647d953f6f3895b062a9 | |
| parent | a9de87c0a668bede3bc2744985a7d6ba903eb378 (diff) | |
| parent | 6433416b4ab7246ebb9fc63c72eb53a844fd6145 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/e2fsprogs/Makefile | 1 | ||||
| -rw-r--r-- | package/xcb-proto/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 4 |
3 files changed, 6 insertions, 1 deletions
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 diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 76e7a3864..142ef30eb 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 diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ff8c3d509..775f871c1 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -59,11 +59,15 @@ else GCC_CONFOPTS+= --disable-lto endif +ifeq ($(ARCH),m68k) +GCC_CONFOPTS+= --disable-tls +else ifeq ($(ARCH),cris) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +endif ifeq ($(ARCH),powerpc) ifeq ($(ADK_TARGET_LIBC),musl) |