diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/glibc | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/glibc')
| -rw-r--r-- | package/glibc/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index acf7d86f9..b6440e479 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/toolchain/glibc/Makefile.inc PKG_NAME:= glibc -PKG_DESCR:= GNU C library -PKG_SECTION:= base +PKG_DESCR:= gnu c library +PKG_SECTION:= base/libs PKG_OPTS:= noremove -PKG_SUBPKGS:= GLIBC GLIBC_DEV GLIBC_STATIC +PKG_SUBPKGS:= GLIBC GLIBC_DEV NO_DISTFILES:= 1 @@ -16,7 +16,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,GLIBC_STATIC,$(PKG_NAME)-static,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) XAKE_FLAGS+= GCC_HONOUR_COPTS=s |