From 946456253f5950dca1df37f1f4d0603bb1b20c77 Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Mon, 4 Jul 2011 17:29:51 +0200 Subject: [PATCH] util-linux: revert PIC commit, found the real problem. --- srcpkgs/util-linux/libblkid-devel.template | 2 +- srcpkgs/util-linux/libblkid.template | 2 +- srcpkgs/util-linux/libmount-devel.template | 4 ++-- srcpkgs/util-linux/libmount.template | 2 +- srcpkgs/util-linux/libuuid-devel.template | 3 ++- srcpkgs/util-linux/libuuid.template | 2 +- srcpkgs/util-linux/template | 6 +++--- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/util-linux/libblkid-devel.template b/srcpkgs/util-linux/libblkid-devel.template index b8651ff5a2..9963f33837 100644 --- a/srcpkgs/util-linux/libblkid-devel.template +++ b/srcpkgs/util-linux/libblkid-devel.template @@ -7,7 +7,7 @@ long_desc=" This package contains files for development, headers, static libs, etc." -revision=1 +revision=2 Add_dependency run zlib-devel Add_dependency run libuuid-devel diff --git a/srcpkgs/util-linux/libblkid.template b/srcpkgs/util-linux/libblkid.template index 624f76ff5e..b79142c23e 100644 --- a/srcpkgs/util-linux/libblkid.template +++ b/srcpkgs/util-linux/libblkid.template @@ -5,7 +5,7 @@ long_desc=" The libblkid package contains a library to handle device identification and token extraction." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run zlib diff --git a/srcpkgs/util-linux/libmount-devel.template b/srcpkgs/util-linux/libmount-devel.template index 8d0673b0a2..158183122f 100644 --- a/srcpkgs/util-linux/libmount-devel.template +++ b/srcpkgs/util-linux/libmount-devel.template @@ -8,11 +8,11 @@ long_desc=" This packages contains files for development, static files, headers, etc." -revision=1 +revision=2 Add_dependency run glibc-devel -Add_dependency run libblkid-devel Add_dependency run libuuid-devel +Add_dependency run libblkid-devel Add_dependency run libmount do_install() diff --git a/srcpkgs/util-linux/libmount.template b/srcpkgs/util-linux/libmount.template index 7ae4a07480..81a5600860 100644 --- a/srcpkgs/util-linux/libmount.template +++ b/srcpkgs/util-linux/libmount.template @@ -6,7 +6,7 @@ long_desc=" mount(8) and /sbin/mount.<type> helpers as well as in some other projects." -revision=1 +revision=2 Add_dependency run glibc Add_dependency run libblkid diff --git a/srcpkgs/util-linux/libuuid-devel.template b/srcpkgs/util-linux/libuuid-devel.template index d8da01599f..e346bf5761 100644 --- a/srcpkgs/util-linux/libuuid-devel.template +++ b/srcpkgs/util-linux/libuuid-devel.template @@ -7,9 +7,10 @@ long_desc=" This packages contains files for development, static files, headers, etc." -revision=1 +revision=2 Add_dependency run glibc-devel +Add_dependency run libuuid do_install() { diff --git a/srcpkgs/util-linux/libuuid.template b/srcpkgs/util-linux/libuuid.template index 9c56ffd3d4..668984cc2a 100644 --- a/srcpkgs/util-linux/libuuid.template +++ b/srcpkgs/util-linux/libuuid.template @@ -5,7 +5,7 @@ long_desc=" libuuid generates and parses 128-bit universally unique id's (UUIDs). See RFC 4122 for more information." -revision=1 +revision=2 Add_dependency run glibc diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 2dcaba2a19..0c75233188 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -3,7 +3,7 @@ pkgname=util-linux _distver=2.19 _patchver=1 version=${_distver}.${_patchver} -revision=1 +revision=2 wrksrc=${pkgname}-${version} distfiles="${KERNEL_SITE}/utils/${pkgname}/v${_distver}/${pkgname}-${version}.tar.bz2" build_style=custom-install @@ -36,8 +36,8 @@ Add_dependency build ncurses-devel do_build() { - export CFLAGS="$XBPS_CFLAGS -fPIC" - ./configure --prefix=/usr --enable-partx --enable-write \ + ./configure ${CONFIGURE_SHARED_ARGS} \ + --enable-partx --enable-write \ --enable-libuuid --disable-makeinstall-chown \ --enable-libblkid --enable-fsck --disable-rpath