Update of /cvsroot/fink/web/xml/packaging
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31056
Modified Files:
packaging.en.xml
Log Message:
improved documentation for 64-bit libraries
Index: packaging.en.xml
===================================================================
RCS file: /cvsroot/fink/web/xml/packaging/packaging.en.xml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- packaging.en.xml 16 Jun 2009 16:44:54 -0000 1.112
+++ packaging.en.xml 19 Jun 2009 18:43:28 -0000 1.113
@@ -375,7 +375,7 @@
on the user's hardware. Current possible values are
'powerpc' for ppc machines
and either 'i386' or 'x86_64' for x86 machines. The choice 'x86_64'
-is only available if the machine is capable of running 64bit libraries
+is only available if the machine is capable of running 64-bit libraries
and executables. (This item was introduced in the fink-0.12 era; the
current description is valid for fink-0.29.5 and later.)
</p>
@@ -445,9 +445,10 @@
<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>.
+this expands to <em>lib/ppc64</em> under the powerpc architecture, and to
+<em>lib/x86_64</em> under the i386 architecture (the proper storage locations
+for 64-bit libraries on 32-bit systems);
+otherwise, this expands to <em>lib</em>.
(Introduced in fink-0.26.0)
</p>
<p>Note that <code>%lib</code> is not permitted in the
@@ -613,7 +614,7 @@
Fink's policy about shared libraries became effective in February 2002.
This section of the documentation discusses version 4
of the policy (which coincides with the release of Fink's 0.5.0 distribution),
-as modified in December, 2006 to handle 64bit libraries
+as modified in December, 2006 to handle 64-bit libraries
and from January, 2008 to handle private shared libraries. (In addition,
the discussion was updated in June, 2008 to eliminate obsolete references to a
transitional period for implementing the shared libraries policy.)
@@ -623,7 +624,7 @@
libraries according to Fink's policy. This means:</p>
<ul>
<li> verify, using <code>otool -L</code> (or <code>otool64 -L</code> for
-64bit libraries), that
+64-bit libraries on 10.4), that
the install_name of each library and
its compatibility and current version numbers are correct </li>
<li> put the public shared libraries in a separate package (except for the
@@ -751,7 +752,7 @@
the "install_name" of the library be
<filename>%p/lib/libbar.N.dylib</filename>.
(You can
find the install_name by running <code>otool -L</code> on your library,
-or <code>otool64 -L</code> for 64bit libraries.) The
+or <code>otool64 -L</code> for 64-bit libraries on 10.4.) The
actual library file may be installed at another location, such as
</p>
<codeblock>
@@ -780,7 +781,7 @@
check that they have been done correctly in your case. You should also
check that current_version and compatibility_version were defined
appropriately for your shared libraries. (These are also shown with the
-<code>otool -L</code> query, or <code>otool64 -L</code> for 64bit libraries.)
+<code>otool -L</code> query, or <code>otool64 -L</code> for 64-bit libraries.)
</p><p>
Files are then divided between the two packages as follows
</p>
@@ -909,8 +910,8 @@
"32-64", and may be absent. If the library architecture is not
explicitly listed, it defaults to the standard value for the current
architecture of Fink; these standard values are "32" for the powerpc
-architecture and "32" for the i386 architecture, and will be "64"
-for any future x86_64 architecture.)
+and i386 architectures, and "64"
+for the x86_64 architecture.)
The dependency should
be stated in the form <code> foo (>= version-revision)</code> where
<code>version-revision</code> refers to
@@ -922,12 +923,12 @@
%p/lib/libbar.1.dylib 2.1.0 bar1 (>= 1.1-2) 32
<<
</codeblock>
-<p>indicates that a (32bit)
+<p>indicates that a (32-bit)
library with <code>-install_name</code> %p/lib/libbar.1.dylib
and <code>-compatibility_version</code> 2.1.0 has been installed since
version 1.1-2 of the <em>bar1</em> package. In addition, this declaration
amounts to a promise
-from the maintainer that a 32bit
+from the maintainer that a 32-bit
library with this name and a compatibility-version
of at least 2.1.0 will always be found in later versions of the <em>bar1</em>
package.
@@ -1321,11 +1322,15 @@
<filename>/sw/lib/x86_64</filename></itemt>
<itemd>
<p>
-This directory is for 64-bit libraries, with <filename>/sw/lib/ppc64</filename>
+This directory is for 64-bit libraries on 32-bit systems,
+with <filename>/sw/lib/ppc64</filename>
being used under powerpc architecture, and
<filename>/sw/lib/x86_64</filename> being used under i386 architecture.
Libraries which have been built 'fat' should be stored in
-<filename>/sw/lib</filename> instead.
+<filename>/sw/lib</filename> instead, and should be so indicated by
+using '32-64' in the corresponding Shlibs entry. Note that under
+the x86_64 architecture, 64-bit
+libraries are to be stored in <filename>/sw/lib</filename>.
</p>
</itemd></item>
@@ -1949,7 +1954,11 @@
<<
<<
</codeblock>
-
+<p>Note that <code>Type: -64bit</code> is generally not appropriate for
+the x86_64 architecture, since in that case
+libraries are being built 64-bit by default
+and stored in <filename>%i/lib</filename>.
+</p>
</itemd></item>
@@ -3008,7 +3017,9 @@
dependency information specifying the Fink package which provides
this library at this compatibility version, and the
library architecture. (The library architecture may either be "32", "64", or
-"32-64", and may be absent; the value defaults to "32" if it is absent.)
+"32-64", and may be absent; if absent,
+the value defaults to "32" under the powerpc and i386 machine architectures,
+and to "64" under the x86_64 machine architecture.)
The dependency should
be stated in the form <code> foo (>= version-revision)</code> where
<code>version-revision</code> refers to
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
