Merge branch 'master' of git+ssh://openadk.org/git/openadk

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
 

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
 

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)