diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:41:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:41:36 +0100 |
| commit | 0aabef127155575e8c8d660605f9401ab15356aa (patch) | |
| tree | b8cd5f06c60cd4e95fd7a2923dabb3b831dd93b3 /package/xorg-server | |
| parent | 0b09c2710166bd95ac9033b048bb6cbf7b4de7c2 (diff) | |
allow native build of a lot of packages
STAGING_TARGET_DIR is used for package Makefile's for
include and library search path's. STAGING_DIR is used
for common code in mk/ or Makefile/rules.mk.
STAGING_TARGET_DIR is /usr when native builds are used.
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 37fcb2df7..28abb1d5d 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -20,6 +20,8 @@ PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SUBPKGS:= XORG_SERVER XORG_SERVER_DEV + PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS_XORG_SERVER:= WITH_DRI @@ -27,9 +29,26 @@ PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib +PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO +PKGCD_WITH_GCRYPT:= use libgcrypt for SHA1 +PKGCS_WITH_GCRYPT:= libgcrypt +PKGCB_WITH_GCRYPT:= libgcrypt +PKGCD_WITH_CRYPTO:= use openssl libcrypto for SHA1 +PKGCS_WITH_CRYPTO:= libopenssl +PKGCB_WITH_CRYPTO:= openssl + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) +CONFIGURE_ARGS+= --with-sha1=libgcrypt +endif + +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_CRYPTO},y) +CONFIGURE_ARGS+= --with-sha1=libcrypto +endif CONFIGURE_ENV+= V=1 CONFIGURE_ARGS+= --with-fontdir=/usr/share/fonts/X11 \ @@ -68,7 +87,7 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif -post-install: +xorg-server-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11 $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions @@ -90,4 +109,12 @@ ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions endif +xorg-server-dev-install: + $(INSTALL_DIR) $(IDIR_XORG_SERVER_DEV)/usr/include/xorg + ${CP} ${WRKINST}/usr/include/xorg/* \ + $(IDIR_XORG_SERVER_DEV)/usr/include/xorg + $(INSTALL_DIR) $(IDIR_XORG_SERVER_DEV)/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/xorg-server.pc \ + $(IDIR_XORG_SERVER_DEV)/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk |