From 15ae1b326fa1f9a67c10f9024f59c6b7e2f71c50 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 13 Aug 2006 18:50:04 +0000 Subject: add "attr" tool. Includes some butchering of their supplied Makefile and aclocal.m4 to prevent all kinds of hardcoded paths...argh... svn path=/nixpkgs/trunk/; revision=6113 --- .../libraries/attr/attr-2.4.32-makefile.patch | 25 +++ pkgs/development/libraries/attr/attr-2.4.32.patch | 171 +++++++++++++++++++++ pkgs/development/libraries/attr/builder.sh | 9 ++ pkgs/development/libraries/attr/default.nix | 14 ++ 4 files changed, 219 insertions(+) create mode 100644 pkgs/development/libraries/attr/attr-2.4.32-makefile.patch create mode 100644 pkgs/development/libraries/attr/attr-2.4.32.patch create mode 100644 pkgs/development/libraries/attr/builder.sh create mode 100644 pkgs/development/libraries/attr/default.nix (limited to 'pkgs/development/libraries/attr') diff --git a/pkgs/development/libraries/attr/attr-2.4.32-makefile.patch b/pkgs/development/libraries/attr/attr-2.4.32-makefile.patch new file mode 100644 index 0000000000000..96b2f78ca801e --- /dev/null +++ b/pkgs/development/libraries/attr/attr-2.4.32-makefile.patch @@ -0,0 +1,25 @@ +diff -rc attr-2.4.32/Makefile attr-2.4.32.new/Makefile +*** attr-2.4.32/Makefile 2006-06-20 08:51:25.000000000 +0200 +--- attr-2.4.32.new/Makefile 2006-08-13 20:47:52.000000000 +0200 +*************** +*** 33,51 **** + endif + + $(CONFIGURE): +- autoconf +- ./configure \ +- --prefix=/ \ +- --exec-prefix=/ \ +- --sbindir=/bin \ +- --bindir=/usr/bin \ +- --libdir=/lib \ +- --libexecdir=/usr/lib \ +- --enable-lib64=yes \ +- --includedir=/usr/include \ +- --mandir=/usr/share/man \ +- --datadir=/usr/share \ +- $$LOCAL_CONFIGURE_OPTIONS + touch .census + + aclocal.m4:: +--- 33,38 ---- diff --git a/pkgs/development/libraries/attr/attr-2.4.32.patch b/pkgs/development/libraries/attr/attr-2.4.32.patch new file mode 100644 index 0000000000000..6ed932e9f15ec --- /dev/null +++ b/pkgs/development/libraries/attr/attr-2.4.32.patch @@ -0,0 +1,171 @@ +diff -rc attr-2.4.32/aclocal.m4 attr-2.4.32.new/aclocal.m4 +*** attr-2.4.32/aclocal.m4 2006-06-20 08:51:25.000000000 +0200 +--- attr-2.4.32.new/aclocal.m4 2006-08-13 19:57:07.000000000 +0200 +*************** +*** 144,175 **** + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) + + if test -z "$MAKE"; then +! AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + if test -z "$MAKE"; then +! AC_PATH_PROG(MAKE, make,, /usr/bin) + fi + make=$MAKE + AC_SUBST(make) + AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) + + if test -z "$LIBTOOL"; then +! AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin) + fi + if test -z "$LIBTOOL"; then +! AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + libtool=$LIBTOOL + AC_SUBST(libtool) + AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) + + if test -z "$TAR"; then +! AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin) + fi + tar=$TAR + AC_SUBST(tar) + if test -z "$ZIP"; then +! AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + + zip=$ZIP +--- 144,175 ---- + AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler]) + + if test -z "$MAKE"; then +! AC_PATH_PROG(MAKE, gmake) + fi + if test -z "$MAKE"; then +! AC_PATH_PROG(MAKE, make) + fi + make=$MAKE + AC_SUBST(make) + AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make]) + + if test -z "$LIBTOOL"; then +! AC_PATH_PROG(LIBTOOL, glibtool) + fi + if test -z "$LIBTOOL"; then +! AC_PATH_PROG(LIBTOOL, libtool) + fi + libtool=$LIBTOOL + AC_SUBST(libtool) + AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool]) + + if test -z "$TAR"; then +! AC_PATH_PROG(TAR, tar) + fi + tar=$TAR + AC_SUBST(tar) + if test -z "$ZIP"; then +! AC_PATH_PROG(ZIP, gzip) + fi + + zip=$ZIP +*************** +*** 182,206 **** + AC_SUBST(makedepend) + + if test -z "$AWK"; then +! AC_PATH_PROG(AWK, awk,, /bin:/usr/bin) + fi + awk=$AWK + AC_SUBST(awk) + + if test -z "$SED"; then +! AC_PATH_PROG(SED, sed,, /bin:/usr/bin) + fi + sed=$SED + AC_SUBST(sed) + + if test -z "$ECHO"; then +! AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin) + fi + echo=$ECHO + AC_SUBST(echo) + + if test -z "$SORT"; then +! AC_PATH_PROG(SORT, sort,, /bin:/usr/bin) + fi + sort=$SORT + AC_SUBST(sort) +--- 182,206 ---- + AC_SUBST(makedepend) + + if test -z "$AWK"; then +! AC_PATH_PROG(AWK, awk) + fi + awk=$AWK + AC_SUBST(awk) + + if test -z "$SED"; then +! AC_PATH_PROG(SED, sed) + fi + sed=$SED + AC_SUBST(sed) + + if test -z "$ECHO"; then +! AC_PATH_PROG(ECHO, echo) + fi + echo=$ECHO + AC_SUBST(echo) + + if test -z "$SORT"; then +! AC_PATH_PROG(SORT, sort) + fi + sort=$SORT + AC_SUBST(sort) +*************** +*** 210,223 **** + + if test "$enable_gettext" = yes; then + if test -z "$MSGFMT"; then +! AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + msgfmt=$MSGFMT + AC_SUBST(msgfmt) + AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) + + if test -z "$MSGMERGE"; then +! AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin) + fi + msgmerge=$MSGMERGE + AC_SUBST(msgmerge) +--- 210,223 ---- + + if test "$enable_gettext" = yes; then + if test -z "$MSGFMT"; then +! AC_PATH_PROG(MSGFMT, msgfmt) + fi + msgfmt=$MSGFMT + AC_SUBST(msgfmt) + AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext) + + if test -z "$MSGMERGE"; then +! AC_PATH_PROG(MSGMERGE, msgmerge) + fi + msgmerge=$MSGMERGE + AC_SUBST(msgmerge) +*************** +*** 225,231 **** + fi + + if test -z "$RPM"; then +! AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin) + fi + rpm=$RPM + AC_SUBST(rpm) +--- 225,231 ---- + fi + + if test -z "$RPM"; then +! AC_PATH_PROG(RPM, rpm) + fi + rpm=$RPM + AC_SUBST(rpm) diff --git a/pkgs/development/libraries/attr/builder.sh b/pkgs/development/libraries/attr/builder.sh new file mode 100644 index 0000000000000..af71890f0c046 --- /dev/null +++ b/pkgs/development/libraries/attr/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +preConfigure() { + autoconf +} + +preConfigure=preConfigure + +genericBuild diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix new file mode 100644 index 0000000000000..79da04d486ad7 --- /dev/null +++ b/pkgs/development/libraries/attr/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, autoconf, libtool, gettext}: + +stdenv.mkDerivation { + name = "attr-2.4.32"; + + builder = ./builder.sh; + src = fetchurl { + url = ftp://oss.sgi.com/projects/xfs/download/download/cmd_tars/attr_2.4.32-1.tar.gz; + md5 = "092739e9b944815aecc1f5d8379d5ea5"; + }; + + buildInputs = [autoconf libtool gettext]; + patches = [./attr-2.4.32.patch ./attr-2.4.32-makefile.patch]; +} -- cgit 1.4.1