diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /package/cluster-glue/Makefile | |
parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) |
resolve merge conflict
Diffstat (limited to 'package/cluster-glue/Makefile')
-rw-r--r-- | package/cluster-glue/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile index f4998efc2..f66c89909 100644 --- a/package/cluster-glue/Makefile +++ b/package/cluster-glue/Makefile @@ -15,7 +15,7 @@ PKG_URL:= http://www.linux-ha.org/wiki/Cluster_Glue PKG_SITES:= http://openadk.org/distfiles/ PKG_NOPARALLEL:= 1 -PKG_LIBC_DEPENDS:= eglibc glibc musl +PKG_LIBC_DEPENDS:= glibc musl PKG_ARCH_DEPENDS:= x86 x86_64 include $(TOPDIR)/mk/package.mk |