diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/libXext | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/libXext')
| -rw-r--r-- | package/libXext/Config.in | 6 | ||||
| -rw-r--r-- | package/libXext/Makefile | 16 |
2 files changed, 9 insertions, 13 deletions
diff --git a/package/libXext/Config.in b/package/libXext/Config.in deleted file mode 100644 index 1110918f5..000000000 --- a/package/libXext/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_LIBXEXT - prompt "libXext................................. X library" - tristate - default n - help - http://www.x.org diff --git a/package/libXext/Makefile b/package/libXext/Makefile index bf3648798..42e972aaf 100644 --- a/package/libXext/Makefile +++ b/package/libXext/Makefile @@ -4,21 +4,23 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libXext -PKG_VERSION:= 1.0.4 +PKG_VERSION:= 1.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= b7749174f9b3c3227bcbabc9ffb7d1a9 -PKG_DESCR:= X Window System client interface to several extensions to the X protocol +PKG_BUILDDEP+= libX11 +PKG_MD5SUM:= 6b61b3f657befded8ae66e04085c413e +PKG_DESCR:= X client interface to extensions of the X protocol PKG_SECTION:= x11 PKG_SITES:= ${MASTER_SITE_XORG} +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-malloc0returnsnull -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog post-install: ${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib |