From ffba11a2913f7475e54ff8d98d5248f9a83d320e Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 21 Sep 2003 06:42:04 +0000 Subject: [PATCH] fixed findutils to install xargs in /bin and create a /usr/bin symlink (this undos parts of rev 660) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1478 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 5 +++++ package/base/findutils/findutils.conf | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 00321213f..a5f5ca6fa 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,9 @@ +*) 2003-09-21 (2.0.0-rc1 - 2.0.0-rc2) + + - fixed findutils to install xargs in /bin and create a /usr/bin symlink + (this undos parts of rev 660) + *) 2003-09-20 (2.0.0-rc1 - 2.0.0-rc2) - added pmg321 diff --git a/package/base/findutils/findutils.conf b/package/base/findutils/findutils.conf index cb28c856c..7205aa5c9 100644 --- a/package/base/findutils/findutils.conf +++ b/package/base/findutils/findutils.conf @@ -20,13 +20,17 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +fu_pm() { + # INSTALL_WRAPPER_FILTER needs to be empty to not filter the symlink + INSTALL_WRAPPER_FILTER="" ln -sfv ../../bin/find $root/usr/bin/find + INSTALL_WRAPPER_FILTER="" ln -sfv ../../bin/xargs $root/usr/bin/xargs + rmdir $root/usr/var || true +} + var_append INSTALL_WRAPPER_FILTER "|" \ - 'sed -e "s,usr/bin/find,bin/find,"' + "sed -e 's,usr/bin/find,bin/find,' -e 's,usr/bin/xargs,bin/xargs,'" -# INSTALL_WRAPPER_FILTER needs to be empty to not filter the symlink ... -hook_add postmake 3 "INSTALL_WRAPPER_FILTER="" ln -sfv ../../bin/find \ - $root/usr/bin/find ; \ - rmdir $root/usr/var || true" +hook_add postmake 3 "fu_pm" export CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"