RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 22-Apr-2012 19:07:08 Branch: rpm-5_4 Handle: 2012042217070602 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/lib rpmfc.c rpmfc.h rpm/macros macros.in Log: haskell dependency generation Submitted by: mdawkins Summary: Revision Changes Path 1.3501.2.243+1 -0 rpm/CHANGES 1.75.2.14 +11 -1 rpm/lib/rpmfc.c 1.19.4.4 +3 -2 rpm/lib/rpmfc.h 1.39.2.27 +5 -1 rpm/macros/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.242 -r1.3501.2.243 CHANGES --- rpm/CHANGES 22 Apr 2012 16:43:06 -0000 1.3501.2.242 +++ rpm/CHANGES 22 Apr 2012 17:07:06 -0000 1.3501.2.243 @@ -1,4 +1,5 @@ 5.4.8 -> 5.4.9: + - mdawkins: haskell dependencies - mdawkins: typelib G-IR - jbj: fix: finish wireing up Alt set:versions. a bit more todo++. - jbj: rpmfc: fix: OS X (and *BSD) are sighandler_t challenged. @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.c ============================================================================ $ cvs diff -u -r1.75.2.13 -r1.75.2.14 rpmfc.c --- rpm/lib/rpmfc.c 21 Apr 2012 00:37:44 -0000 1.75.2.13 +++ rpm/lib/rpmfc.c 22 Apr 2012 17:07:07 -0000 1.75.2.14 @@ -911,6 +911,10 @@ #endif xx = rpmfcHelper(fc, 'R', "ruby"); } else + if (fc->fcolor->vals[fc->ix] & RPMFC_HASKELL) { + xx = rpmfcHelper(fc, 'P', "haskell"); + xx = rpmfcHelper(fc, 'R', "haskell"); + } else if (fc->fcolor->vals[fc->ix] & RPMFC_TYPELIB) { xx = rpmfcHelper(fc, 'P', "typelib"); #ifdef NOTYET @@ -1044,7 +1048,7 @@ /*@unchecked@*/ static struct rpmfcApplyTbl_s rpmfcApplyTable[] = { { rpmfcELF, RPMFC_ELF }, - { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB) }, + { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_HASKELL|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP|RPMFC_MONO|RPMFC_TYPELIB) }, #if defined(RPM_VENDOR_MANDRIVA) { rpmfcSYMLINK, RPMFC_SYMLINK }, #endif @@ -1128,6 +1132,12 @@ } } + /* XXX ugly quick & dirty integration of haskell() dependencies */ + { fn = strstr(fc->fn[fc->ix], "/usr/share/haskell-deps"); + if (fn) + fc->fcolor->vals[fc->ix] |= RPMFC_HASKELL; + } + if (fc->fcolor->vals[fc->ix]) for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) { if (!(fc->fcolor->vals[fc->ix] & fcat->colormask)) @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.h ============================================================================ $ cvs diff -u -r1.19.4.3 -r1.19.4.4 rpmfc.h --- rpm/lib/rpmfc.h 20 Apr 2012 18:40:52 -0000 1.19.4.3 +++ rpm/lib/rpmfc.h 22 Apr 2012 17:07:07 -0000 1.19.4.4 @@ -24,8 +24,9 @@ #define RPMFC_ELF (RPMFC_ELF32|RPMFC_ELF64|RPMFC_ELFMIPSN32) /* (1 << 3) leaks into package headers, reserved */ - /* bits 4-5 unused */ - RPMFC_TYPELIB = (1 << 6), + /* bit 4 unused */ + RPMFC_TYPELIB = (1 << 5), + RPMFC_HASKELL = (1 << 6), RPMFC_RUBY = (1 << 7), RPMFC_PKGCONFIG = (1 << 8), RPMFC_LIBTOOL = (1 << 9), @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.39.2.26 -r1.39.2.27 macros.in --- rpm/macros/macros.in 22 Apr 2012 16:43:07 -0000 1.39.2.26 +++ rpm/macros/macros.in 22 Apr 2012 17:07:08 -0000 1.39.2.27 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.26 2012/04/22 16:43:07 mdawkins Exp $ +# $Id: macros.in,v 1.39.2.27 2012/04/22 17:07:08 mdawkins Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -996,6 +996,10 @@ #%%{load:%{_usrlibrpm}/macros.d/gstreamer} #------------------------------------------------------------------------ +# haskell(...) configuration. +#%%{load:%{_usrlibrpm}/macros.d/haskell} + +#------------------------------------------------------------------------ # perl(...) configuration #%%{load:%{_usrlibrpm}/macros.d/perl} @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org