From 3791b9552d4b4d0b2399745a301585c0b125826b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 12 Jan 2011 17:17:43 +0100 Subject: [PATCH] xbps-devel: use external proplib and libfetch. --- srcpkgs/xbps-devel/template | 7 ++++++- srcpkgs/xbps-devel/xbps-devel-static.template | 2 +- xbps-src/common/mapping_shlib_binpkg.txt | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template index e22af5eb22b..ccfba55713b 100644 --- a/srcpkgs/xbps-devel/template +++ b/srcpkgs/xbps-devel/template @@ -3,7 +3,8 @@ pkgname=xbps-devel version="$(date +%Y%m%d)" build_style=configure configure_args="--prefix=/ --includedir=/usr/include ---datadir=/usr/share --mandir=/usr/share/man --with-pie" +--datadir=/usr/share --mandir=/usr/share/man --with-pie +--with-external-proplib --with-external-libfetch" short_desc="The XBPS package system (development branch)" maintainer="Juan RP " long_desc=" @@ -18,12 +19,16 @@ noextract=yes Add_dependency run glibc Add_dependency run zlib +Add_dependency run proplib Add_dependency run libarchive Add_dependency run libssl +Add_dependency run libfetch Add_dependency build mercurial Add_dependency build zlib-devel +Add_dependency build proplib-devel Add_dependency build libarchive-devel Add_dependency build openssl-devel +Add_dependency build libfetch-devel do_fetch() { diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template index cc1f32f03e7..baa1022d5b3 100644 --- a/srcpkgs/xbps-devel/xbps-devel-static.template +++ b/srcpkgs/xbps-devel/xbps-devel-static.template @@ -6,7 +6,7 @@ long_desc="${long_desc} This package contains the static binaries and library, that can be used on any GNU/Linux distribution matching the architecture." -replaces="xbps-static" +replaces="xbps-static>=0" do_install() { diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index 70092519efa..42aff5e0cc4 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -204,7 +204,8 @@ libgnutls-openssl.so.26 gnutls gnutls-devel libwrap.so tcp_wrappers-libs tcp_wrappers-devel libdevmapper.so.1.02 device-mapper device-mapper-devel libprop.so proplib proplib-devel -libxbps.so xbps +libxbps.so xbps xbps-static +libxbps.so xbps-devel xbps-devel-static libfontenc.so libfontenc libfontenc-devel libXfont.so libXfont libXfont-devel libx86.so libx86 libx86-devel