Browse Source

fix dev subpackage, fix missing libgcc

Waldemar Brodkorb 9 years ago
parent
commit
2dd4a46a9f
2 changed files with 6 additions and 3 deletions
  1. 4 1
      package/libgcc/Makefile
  2. 2 2
      package/uclibc-ng/Makefile

+ 4 - 1
package/libgcc/Makefile

@@ -9,6 +9,9 @@ endif
 ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
 include ${ADK_TOPDIR}/toolchain/uclibc/Makefile.inc
 endif
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y)
+include ${ADK_TOPDIR}/toolchain/uclibc-ng/Makefile.inc
+endif
 
 PKG_NAME:=		libgcc
 PKG_DESCR:=		gcc library
@@ -16,7 +19,7 @@ PKG_SECTION:=		base/libs
 PKG_OPTS:=		noremove
 
 PKG_DFLT_LIBGCC:=	y if !(ADK_TOOLCHAIN_ONLY)
-PKG_LIBC_DEPENDS:=	uclibc glibc
+PKG_LIBC_DEPENDS:=	uclibc uclibc-ng glibc
 
 
 NO_DISTFILES:=		1

+ 2 - 2
package/uclibc-ng/Makefile

@@ -21,8 +21,8 @@ NO_DISTFILES:=		1
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,UCLIBC_NG,uclibc-ng,$(GIT_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,UCLIBC_NG_DEV,uclibc-ng-dev,$(GIT_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_UCLIBC_NG_DEV},${PKGSC_UCLIBC_NG_DEV},${PKG_OPTS}))
+$(eval $(call PKG_template,UCLIBC_NG,uclibc-ng,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,UCLIBC_NG_DEV,uclibc-ng-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_UCLIBC_NG_DEV},${PKGSC_UCLIBC_NG_DEV},${PKG_OPTS}))
 
 CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual