diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:40:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-22 18:40:05 +0200 |
| commit | a6717421b7e4ed1631bd8e310881f76c0ba1b0fa (patch) | |
| tree | e25b953e70eed130d35b13b0dd3eeb298d9ea155 | |
| parent | ca68bf14a3b7f6406599308174e959b5b312bef3 (diff) | |
| parent | 2b52e67da00817f93884a344a9a8b7e2c585fc8c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | TODO | 8 | ||||
| -rw-r--r-- | package/libXext/Makefile | 3 | ||||
| -rw-r--r-- | package/libXi/Makefile | 10 | ||||
| -rw-r--r-- | package/xfsprogs/Makefile | 3 |
4 files changed, 15 insertions, 9 deletions
@@ -1,16 +1,10 @@ -- port openjdk -- port LXDE +- automatic subpackage of development files - toolchain rebuild when changes to config require it -- add and test brcm 2.6 wireless support - man pages in ipkg/tgz packages (automatic) - automate /etc handling via conffiles - distcc evaluation -- fix qemu package - openssl ocf support check - new package minidlna -- PKG_CONFLICTS for python/python2, is this possible with Kconfig? - mirror only option, for no internet access - help text for config/ needs adoption - diet libc / klibc / newlib support -- locales support -- pcc support? clang+llvm diff --git a/package/libXext/Makefile b/package/libXext/Makefile index d99bb7247..f0d716bc3 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -15,6 +15,7 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_SUBPKGS:= LIBXEXT LIBXEXT_DEV PKGSD_LIBXEXT_DEV:= X11 extension headers PKGSC_LIBXEXT_DEV:= x11/devel +PKGSS_LIBXEXT_DEV:= xextproto ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly @@ -23,7 +24,7 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) +$(eval $(call PKG_template,LIBXEXT_DEV,libxext-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXEXT_DEV},${PKGSD_LIBXEXT_DEV},${PKGSC_LIBXEXT_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --disable-malloc0returnsnull diff --git a/package/libXi/Makefile b/package/libXi/Makefile index bdf1c54c8..990edce4c 100644 --- a/package/libXi/Makefile +++ b/package/libXi/Makefile @@ -13,6 +13,10 @@ PKG_BUILDDEP:= xproto xextproto libXext PKG_URL:= http://xorg.freedesktop.org/ PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= LIBXI LIBXI_DEV +PKGSS_LIBXI_DEV:= inputproto +PKGSC_LIBXI_DEV:= x11/devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif @@ -20,6 +24,7 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBXI,libxi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +$(eval $(call PKG_template,LIBXI_DEV,libxi-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBXI_DEV},${PKG_DESCR},${PKGSC_LIBXI_DEV},$(PKG_OPTS))) CONFIGURE_ARGS+= --disable-malloc0returnsnull @@ -28,4 +33,9 @@ post-install: $(CP) $(WRKINST)/usr/lib/libXi*.so* \ $(IDIR_LIBXI)/usr/lib +libxi-dev-install: + $(INSTALL_DIR) $(IDIR_LIBXI_DEV)/usr/include + $(CP) $(WRKINST)/usr/include/* \ + $(IDIR_LIBXI_DEV)/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 2af6fc389..a5b49b895 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= xfsprogs PKG_VERSION:= 3.1.5 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b1db37749e2b4149a0dd178abff956be PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs @@ -32,5 +32,6 @@ do-install: ${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/growfs/xfs_growfs ${IDIR_XFSPROGS}/usr/sbin include ${TOPDIR}/mk/pkg-bottom.mk |