From ab26773377548cb2066086c0ea0b2ba53b183947 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 23 Oct 2014 09:39:49 +0000 Subject: [PATCH] pkgutils: updated to 5.35.6 and removed static build to avoid errors on footprint creation with UID/GID = 0/0 instead of root/root --- pkgutils/.md5sum | 4 ++-- pkgutils/Pkgfile | 9 +++++---- pkgutils/pkgmk.conf.patch | 13 +++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgutils/.md5sum b/pkgutils/.md5sum index 538e607..0222d6f 100644 --- a/pkgutils/.md5sum +++ b/pkgutils/.md5sum @@ -1,2 +1,2 @@ -9a15ec322dd44035864c07c24daaa03b pkgmk.conf.patch -04ebdfa4470db3d7cf56d6b1e25cd31e pkgutils-5.35.5.tar.gz +5ca765adf36e8ef13701248f10e4872b pkgmk.conf.patch +5f4ba23340492548ebf58b0ce7109e69 pkgutils-5.35.6.tar.gz diff --git a/pkgutils/Pkgfile b/pkgutils/Pkgfile index 7f2bc4a..c87e910 100644 --- a/pkgutils/Pkgfile +++ b/pkgutils/Pkgfile @@ -5,13 +5,14 @@ # Depends on: libarchive name=pkgutils -version=5.35.5 +version=5.35.6 release=1 source=(http://crux.nu/files/$name-$version.tar.gz \ pkgmk.conf.patch) build () { - cd $name-$version - patch -p1 -i $SRC/pkgmk.conf.patch - make DESTDIR=$PKG install + cd $name-$version + patch -p0 -i $SRC/pkgmk.conf.patch + sed -i -e "s|\--static||g" -e "s|\-static||g" Makefile + make DESTDIR=$PKG install } diff --git a/pkgutils/pkgmk.conf.patch b/pkgutils/pkgmk.conf.patch index 9ee7df3..0f05a56 100644 --- a/pkgutils/pkgmk.conf.patch +++ b/pkgutils/pkgmk.conf.patch @@ -1,13 +1,14 @@ ---- pkgutils-5.35.3/pkgmk.conf.orig 2013-09-18 11:23:48.856285249 +0200 -+++ pkgutils-5.35.3/pkgmk.conf 2013-09-18 11:27:02.616284373 +0200 -@@ -2,8 +2,9 @@ +--- pkgmk.conf.orig 2014-10-16 15:59:34.057394811 +0000 ++++ pkgmk.conf 2014-10-16 16:00:18.437371591 +0000 +@@ -2,9 +2,8 @@ # /etc/pkgmk.conf: pkgmk(8) configuration # -export CFLAGS="-O2 -march=x86-64 -pipe" +-export CXXFLAGS="${CFLAGS}" +- +export CFLAGS="-O2 -pipe -mfloat-abi=hard" - export CXXFLAGS="${CFLAGS}" -+export MAKEFLAGS="" ++export CXXFLAGS="$CFLAGS" + # export MAKEFLAGS="-j2" case ${PKGMK_ARCH} in - "64") -- 2.26.2