From: David R. M. <dr...@fi...> - 2006-12-09 06:17:27
|
Begin forwarded message: > From: "David R. Morrison" <dm...@us...> > Date: December 8, 2006 10:13:57 PM PST > To: fin...@li... > Subject: [cvs] web/xml/packaging packaging.en.xml,1.91,1.92 > Reply-To: fin...@li... > > Update of /cvsroot/fink/web/xml/packaging > In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10309 > > Modified Files: > packaging.en.xml > Log Message: > Document changes in fink 0.26.0 > > > Index: packaging.en.xml > =================================================================== > RCS file: /cvsroot/fink/web/xml/packaging/packaging.en.xml,v > retrieving revision 1.91 > retrieving revision 1.92 > diff -u -d -r1.91 -r1.92 > --- packaging.en.xml 3 Dec 2006 21:21:22 -0000 1.91 > +++ packaging.en.xml 9 Dec 2006 06:13:54 -0000 1.92 > @@ -106,8 +106,17 @@ > which directories are read. > The name of package description files must be the full package name > plus the extension ".info". > -Starting with fink 0.13.0, the use of the simple package name plus > -".info" is also supported in order to simplify package updates. > +As of fink 0.26.0, there are several different ways to specify the > +filename: it is recommended to use the shortest version which is > +consistent with other needed package files. The filename takes > +the form: the invariant packagename, optionally > +followed by the architecture, optionally followed by the > +distribution, > +optionally followed by either version or version-revision, each > delimited by > +hyphens, concluding with ".info". > +The "architecture" and "distribution" components are only allowed > +if the corresponding field is present in the package, and if it > specifies > +exactly one value. > </p> > <p> > The package description tree is organized with several levels of > @@ -366,7 +375,8 @@ > </p> > </itemd></item> > > -<item><itemt>%type_raw[<em>type</em>], %type_pkg[<em>type</em>]</ > itemt> > +<item><itemt>%type_raw[<em>type</em>], %type_pkg[<em>type</em>], > +%type_num[<em>type</em>]</itemt> > <itemd> > <p> > pseudo-hashes returning the subtype for the given <em>type</em>. See > @@ -374,7 +384,8 @@ > The _raw form is the exact subtype string, while the _pkg form has > all > period characters removed (as per Fink's language-version package > naming > convention and for other clever uses). (Introduced in a post-0.19.2 > -CVS version of fink) > +CVS version of fink.) The _num form was introduced in fink-0.26.0 > +and removes all non-digits from the <code>Type</code> field. > </p> > </itemd></item> > > @@ -408,6 +419,17 @@ > (Introduced in fink-0.24.12) > </p> > </itemd></item> > + > +<item><itemt>%lib</itemt> > +<itemd> > +<p> > +If <code>Type: -64bit</code> is defined to be <code>-64bit</code>, > +this expands to <em>lib/ppc64</em> on powerpc machines, and to > +<em>lib/x86_64</em> on intel machines (the proper storage locations > +for 64-bit libraries); otherwise, this expands to <em>lib</em>. > +(Introduced in fink-0.26.0) > +</p> > +</itemd></item> > </itemtable> > > </section> > @@ -1737,6 +1759,31 @@ > << > << > </codeblock> > +<p> > +Starting in fink 0.26.0, there is a special <code>Type: -64bit</code> > +which controls a new percent expansion <code>%lib</code> and also > +changes the default value of <code>LDFLAGS</code>. When combined > +with the new construction %type_num[], this allows a single .info > file > +to build both a 32-bit version of a library and a 64-bit version. > +Here's some sample code: > +</p> > +<codeblock> > +Info2: << > +Package: foo%type_pkg[-64bit] > +Type: -64bit (boolean) > +Depends: (%type_raw[-64bit] = -64bit) 64bit-cpu > +ConfigureParams: --libdir='${prefix}/%lib' > +SplitOff: << > + Package: %N-shlibs > + Files: %lib/libfoo.*.dylib > + Shlibs: << > + %p/%lib/libfoo.1.dylib 1.0.0 %n (>= 1.0-1) %type_num[-64bit] > + << > +<< > +<< > +</codeblock> > + > + > </itemd></item> > > <item><itemt>License</itemt> > @@ -2423,6 +2470,11 @@ > CPPFLAGS: -I%p/include > LDFLAGS: -L%p/lib > </codeblock> > +<p> Starting in fink 0.26.0, there is one exception to these > defaults: > +if <code>Type: -64bit</code> is set to <code>-64bit</code>, then the > +default value of <code>LDFLAGS</code> is <code>-L%p/%lib -L%p/lib</ > code> > +instead. > +</p> > <p> > In addition, starting in fink 0.17.0, the following values are set > for > the 10.4-transitional distribution and earlier (but are not set for > > > ---------------------------------------------------------------------- > --- > Take Surveys. Earn Cash. Influence the Future of IT > Join SourceForge.net's Techsay panel and you'll get the chance to > share your > opinions on IT & business topics through brief surveys - and earn cash > http://www.techsay.com/default.php? > page=join.php&p=sourceforge&CID=DEVDEV > _______________________________________________ > Fink-commits mailing list > Fin...@li... > https://lists.sourceforge.net/lists/listinfo/fink-commits |