Changeset 7f1773b


Ignore:
Timestamp:
Aug 26, 2009, 5:00:51 AM (13 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d4106ec
Parents:
038f274
Message:

Fixed the location for the Zlib sed in the perl build. Thanks to Roy Bekken for seeing this and suggesting a fix.

I took this fix one step further and noticed that the sed was putting /usr/include in the libdir field. Updated it to use /usr/include only for headers and /usr/lib{,32,64} respectivly for libraries.

Location:
BOOK/final-system
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/perl.xml

    r038f274 r7f1773b  
    3535    <para os="s3">By default, Perl's Compress::Raw::Zlib module builds and
    3636    links against its own internal copy of Zlib. The following command will
    37     tell it use the system-installed Zlib:</para>
     37    tell it to use the system-installed Zlib:</para>
    3838
    3939<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
    40         -e '/^INCLUDE\|^LIB/ s|\./zlib-src|/usr/include|' \
    41         ext/Compress/Raw/Zlib/config.in</userinput></screen>
     40       -e '/^INCLUDE/s|\./zlib-src|/usr/include|' \
     41       -e '/^LIB/s|\./zlib-src|/usr/lib|' \
     42       ext/Compress-Raw-Zlib/config.in</userinput></screen>
    4243
    4344    <note os="a00">
  • BOOK/final-system/multilib/perl-64bit.xml

    r038f274 r7f1773b  
    3434    xpointer="xpointer(//*[@os='s3'])"/>
    3535
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/perl.xml"
    38     xpointer="xpointer(//*[@os='s4'])"/>
     36<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
     37       -e '/^INCLUDE/s|\./zlib-src|/usr/include|' \
     38       -e '/^LIB/s|\./zlib-src|/usr/lib64|' \
     39       ext/Compress-Raw-Zlib/config.in</userinput></screen>
    3940
    4041    <para os="mp1">Perl does not, by default, know about library directories with names other
  • BOOK/final-system/multilib/perl-n32.xml

    r038f274 r7f1773b  
    3535    xpointer="xpointer(//*[@os='s3'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    38     href="../common/perl.xml"
    39     xpointer="xpointer(//*[@os='s4'])"/>
     37<screen os="s4"><userinput>sed -i -e '/^BUILD_ZLIB/ s/True/False/' \
     38       -e '/^INCLUDE/s|\./zlib-src|/usr/include|' \
     39       -e '/^LIB/s|\./zlib-src|/usr/lib32|' \
     40       ext/Compress-Raw-Zlib/config.in</userinput></screen>
    4041
    4142    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Note: See TracChangeset for help on using the changeset viewer.