diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 17:56:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-25 17:56:08 +0100 |
| commit | add25e96614d571ee2e60f98a693145b232dc826 (patch) | |
| tree | 9c26b78e1ed50901de0cb049d0dd8f8d671e9552 | |
| parent | 826fae84981bf030b6bb9d20117a1a1634ba3334 (diff) | |
fix cups package, only libcups at the moment, disable openjdk7 musl
| -rw-r--r-- | package/cups/Makefile | 23 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 1 |
2 files changed, 8 insertions, 16 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index 0d20cd61a..28bb45116 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -38,7 +38,9 @@ HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --disable-openssl \ --disable-cdsassl \ --disable-dbus \ - --disable-ssl + --disable-ssl \ + --with-components=core \ + --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ OPTIM='-fPIC' @@ -57,7 +59,9 @@ CONFIGURE_ARGS+= --with-cups-user=cups \ --disable-openssl \ --disable-cdsassl \ --disable-dbus \ - --disable-ssl + --disable-ssl \ + --with-components=core \ + --with-rcdir=$(STAGING_TARGET_DIR)/etc FAKE_FLAGS+= DSTROOT="${WRKINST}" STRIP="/bin/true" ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) @@ -66,22 +70,9 @@ else XAKE_FLAGS+= OPTIM='-fPIC' endif -cups-hostpackage: - cups-install: - ${INSTALL_DIR} ${IDIR_CUPS}/usr/bin - ${INSTALL_DIR} ${IDIR_CUPS}/usr/sbin - ${INSTALL_DIR} ${IDIR_CUPS}/etc/cups - ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib/cups/daemon - ${CP} ${WRKINST}/etc/cups/* ${IDIR_CUPS}/etc/cups/ - rm ${IDIR_CUPS}/etc/cups/cupsd.conf.default - ${CP} ${WRKINST}/usr/bin/* ${IDIR_CUPS}/usr/bin/ - rm -f ${IDIR_CUPS}/usr/bin/cups-config + ${INSTALL_DIR} ${IDIR_CUPS}/usr/lib ${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/cups/daemon/* \ - ${IDIR_CUPS}/usr/lib/cups/daemon/ - ${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/ - ${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/ include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 89d0a0600..7db33966f 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -27,6 +27,7 @@ GCJ_VER:= 4.7.3 PKG_HOST_DEPENDS:= linux PKG_ARCH_DEPENDS:= arm mips ppc sparc x86 x86_64 +PKG_LIBC_DEPENDS:= uclicb eglibc glibc PKG_SYSTEM_DEPENDS:= !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong PKG_SUBPKGS:= OPENJDK7 |