From 0c2a5b90dabd4cde8dbab6caaebf316fbb53137e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 23 Oct 2008 23:27:10 +0200 Subject: [PATCH] Added file-4.26 template and make xbps-base-chroot depend on it. Also allow packages to disable fixup_libtool_file() via $no_fixup_libtool, it's enabled by default. --HG-- extra : convert_revision : 5fd550379cc78d08c2131fa011ee0121422bbae4 --- templates/file.tmpl | 15 +++++++++++++++ templates/xbps-base-chroot.tmpl | 2 +- xbps.sh | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 templates/file.tmpl diff --git a/templates/file.tmpl b/templates/file.tmpl new file mode 100644 index 00000000000..a85488bf2b8 --- /dev/null +++ b/templates/file.tmpl @@ -0,0 +1,15 @@ +# Template file for 'file' +pkgname=file +version=4.26 +distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version@.tar.gz" +build_style=gnu_configure +no_libtool_fixup=yes +short_desc="File type identification utility" +maintainer="Juan RP " +checksum=682f7de5c12d35ff2d9e2ec3c6a753bd5a01e0f7f3110501be0bafef1d5e9654 +long_desc=" + File attempts to classify files depending on their contents and prints + a description if a match is found." + +build_depends="zlib-1.2.3" +run_depends="glibc-2.8 zlib-1.2.3" diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl index 5bb1a30f395..05063664218 100644 --- a/templates/xbps-base-chroot.tmpl +++ b/templates/xbps-base-chroot.tmpl @@ -10,4 +10,4 @@ long_desc=" build_depends="glibc-2.8 bash-3.2 coreutils-6.12 sed-4.1.5 make-3.81 tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 grep-2.5.3 findutils-4.4.0 - diffutils-2.8.1 proplib-0.1 linux-headers-2.6.27.3" + diffutils-2.8.1 file-4.26 proplib-0.1 linux-headers-2.6.27.3" diff --git a/xbps.sh b/xbps.sh index cda39846b37..96c5cbcf35e 100755 --- a/xbps.sh +++ b/xbps.sh @@ -215,7 +215,7 @@ reset_tmpl_vars() run_stuff_before_install_cmd run_stuff_after_install_cmd \ make_install_target postinstall_helpers version \ ignore_files tar_override_cmd xml_entries sgml_entries \ - build_depends \ + build_depends no_fixup_libtool \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_BUILD_DONE XBPS_INSTALL_DONE" @@ -527,6 +527,7 @@ fetch_distfiles() fixup_libtool_file() { [ "$pkgname" = "libtool" -o ! -f $wrksrc/libtool ] && return 0 + [ -n "$no_libtool_fixup" ] && return 0 sed -i -e \ 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec="-Wl,-rpath /usr/lib"|g' \